• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 4ca6a151
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4ca6a151
riff.c 29.9 KB