[FFmpeg-cvslog] Merge commit '3a19405d574a467c68b48e4b824c76617fd59de0'
Michael Niedermayer
git at videolan.org
Tue Jul 29 21:10:48 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 29 20:57:42 2014 +0200| [80a3a6611fe5866163b2e64da7c492fff7874a03] | committer: Michael Niedermayer
Merge commit '3a19405d574a467c68b48e4b824c76617fd59de0'
* commit '3a19405d574a467c68b48e4b824c76617fd59de0':
avformat: Use the mime type information in input probe
Conflicts:
libavformat/format.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=80a3a6611fe5866163b2e64da7c492fff7874a03
---
More information about the ffmpeg-cvslog
mailing list