• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7ed9ec03
    Michael Niedermayer authored
    * qatar/master:
      dwt: Drop unused functions spatial_compose{53|97}i()
      nutdec: Remove unused and broken debug function stub
      avcodec: Drop long-deprecated imgconvert.h header
      Add Opus support to the Ogg muxer.
      Add Opus codec id and codec description.
      avformat: Identify anonymous AVIO typedef structs.
    
    Conflicts:
    	libavcodec/avcodec.h
    	libavcodec/codec_desc.c
    	libavcodec/imgconvert.h
    	libavcodec/version.h
    	libavformat/oggenc.c
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7ed9ec03
imgconvert.c 28.7 KB