eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-16 03:50:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
0739179bfb002324eea20f1c44c5f586b6bd3e04
ffmpeg/libavutil/parseutils.c
Michael Niedermayer 0739179bfb Merge commit '108f2f381acb93827fb4add0517eeae859afa3bf' 
* commit '108f2f381acb93827fb4add0517eeae859afa3bf':
  parseutils: Extend small_strptime to be used in avformat

Conflicts:
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-07 20:01:36 +02:00

28 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink