ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Jul 29
19:55:15 2014 +0200| [e066f01539fd2ed19bda2031c43ddf266f0a000a] | committer:
Michael Niedermayer
Merge commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c'
* commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c':
avformat: Move av_probe_input* to format.c
Conflicts:
libavformat/format.c
libavformat/utils.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e066f01539fd2ed19bda2031c43ddf266f0a000a
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
