• Michael Niedermayer's avatar
    Merge commit '6f273093' · 787be6d0
    Michael Niedermayer authored
    * commit '6f273093':
      LucasArts SMUSH VIMA audio decoder
    
    Conflicts:
    	Changelog
    	libavcodec/avcodec.h
    	libavcodec/codec_desc.c
    	libavcodec/version.h
    	libavcodec/vima.c
    
    This commit adds a AV_CODEC_ID_ADPCM_VIMA alias in addition to the previously
    used AV_CODEC_ID_VIMA, as well as a AVCodec with name "adpcm_vima" in addition
    to the previously used name "vima"
    These changes are needed for compatibility with the renamed codec in libav
    
    See: b1835732 and others
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    787be6d0
avcodec.h 173 KB