[FFmpeg-cvslog] Merge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'
Michael Niedermayer
git at videolan.org
Mon Jun 16 13:03:17 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 16 12:54:36 2014 +0200| [f0fbd9105bc1edbd40fc06246aded92a9a6a5d3a] | committer: Michael Niedermayer
Merge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'
* commit '711aa2a82727907f778fb8aa9a93aff2120170f2':
lavf: dump stream side data when probing
Conflicts:
libavformat/dump.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0fbd9105bc1edbd40fc06246aded92a9a6a5d3a
---
More information about the ffmpeg-cvslog
mailing list