breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
e22edbfd413242dda720dc5191fc00a51c24d74c
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