ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Aug 10
01:36:21 2014 +0200| [c218d8218d95684c5e1b4c09ed0f258457f0ae7c] | committer:
Michael Niedermayer
Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'
* commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b':
Remove obsolete FF_API_PROBE_MIME cruft.
Conflicts:
libavformat/avformat.h
libavformat/format.c
libavformat/version.h
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c218d8218d95684c5e1b4c09ed0f258457f0ae7c
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
