ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Sep 27
01:35:46 2014 +0200| [b7a55388706b81db2e8ec0b8b093edf9deede21e] | committer:
Michael Niedermayer
Merge commit '883e98bc25755327565d8ae0f565a6c886f24816'
* commit '883e98bc25755327565d8ae0f565a6c886f24816':
probe: Bump the score for mime type matching
Conflicts:
libavformat/format.c
See: bcac0f401001e6ebb0ae2718cc42d30b2009de4b
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7a55388706b81db2e8ec0b8b093edf9deede21e
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
