• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 2acb5cd9
    Michael Niedermayer authored
    * qatar/master:
      libopus: Remap channels using libopus' internal remapping.
      Opus decoder using libopus
      avcodec: document the use of AVCodecContext.delay for audio decoding
      vc1dec: add flush function for WMV9 and VC-1 decoders
      http: Increase buffer sizes to cope with longer URIs
      nutenc: const correctness for ff_put_v_trace/put_s_trace function arguments
      h264_refs: Fix debug tprintf argument types
      golomb: const correctness for get_ue()/get_se() function arguments
      get_bits: const correctness for get_bits_trace()/get_xbits_trace() arguments
    
    Conflicts:
    	Changelog
    	libavcodec/Makefile
    	libavcodec/version.h
    	libavformat/http.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2acb5cd9
vc1dec.c 223 KB