[FFmpeg-cvslog] Merge commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8'
Michael Niedermayer
git at videolan.org
Thu Oct 9 01:03:30 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 8 23:33:24 2014 +0200| [f22f873ef013098d61d1e9fc311f5a373fb4f933] | committer: Michael Niedermayer
Merge commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8'
* commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8':
dump: split audio and video probing on multiple lines
Conflicts:
libavcodec/utils.c
libavformat/dump.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f22f873ef013098d61d1e9fc311f5a373fb4f933
---
More information about the ffmpeg-cvslog
mailing list