ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=80a3a6611fe5866163b2e64da7c492fff7874a03
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
