[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Tue Aug 23 18:44:28 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 23 18:26:37 2011 +0200| [4ca6a151e0c48f2729027ac263269cb50e88ed71] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: print the codecs names in the stream mapping.
avconv: move the avcodec_find_decoder() call to add_input_streams().
Windows Media Image decoder (WMVP/WVP2)
ac3enc: remove outdated TODO comment for apply_channel_coupling()
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/vc1dec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ca6a151e0c48f2729027ac263269cb50e88ed71
---
More information about the ffmpeg-cvslog
mailing list