• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · f58f75dd
    Michael Niedermayer authored
    * qatar/master:
      rv34: error out on size changes with frame threading
      aacsbr: Add a debug check to sbr_mapping.
      aac: Reset some state variables when turning SBR off
      aac: Reset PS parameters on header decode failure.
      fate: add wmalossless test.
      aacsbr: handle m_max values smaller than 4.
    
    Conflicts:
    	libavcodec/aacsbr.c
    	tests/fate/lossless-audio.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f58f75dd
lossless-audio.mak 889 Bytes