• Michael Niedermayer's avatar
    Merge commit '0f24a3ca' · e052f065
    Michael Niedermayer authored
    * commit '0f24a3ca':
      lavc: remove disabled FF_API_OLD_ENCODE_VIDEO cruft
      lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
      lavc: remove disabled FF_API_OLD_DECODE_AUDIO cruft
    
    Conflicts:
    	libavcodec/flacenc.c
    	libavcodec/libgsm.c
    	libavcodec/utils.c
    	libavcodec/version.h
    
    The compatibility wrapers are left as they likely sre still
    in wide use. They will be removed when they break or otherwise
    cause work without an volunteer being available.
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e052f065
libfdk-aacenc.c 15.6 KB