• Michael Niedermayer's avatar
    Merge commit '8b8899ac' · 35ce42e0
    Michael Niedermayer authored
    * commit '8b8899ac':
      fate: Declare avcodec/avformat deps in the respective Makefile snippets
      fate: Add dependencies for WMA and WavPack tests
      Improve wording and spelling of av_log_missing_feature messages.
      lavu: remove disabled FF_API_AV_FIFO_PEEK cruft
    
    Conflicts:
    	libavcodec/aacsbr.c
    	libavutil/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    35ce42e0
aacdec.c 104 KB