[FFmpeg-cvslog] Merge commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c'
Michael Niedermayer
git at videolan.org
Tue Jul 29 20:07:27 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | 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 <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e066f01539fd2ed19bda2031c43ddf266f0a000a
---
More information about the ffmpeg-cvslog
mailing list