Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Mar 2012 09:59:43 +0000 (10:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Mar 2012 09:59:43 +0000 (10:59 +0100)
commitf58f75dd92a5d8b48e23865f6d4a69ce70d0bd1c
tree1345408bddb30de183f5945cb3673262554f16bb
parentb222c28ee885187c5fcded69d8fa98fe60c70a7e
parentcb7190cd2c691fd93e4d3664f3fce6c19ee001dd
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacps.c
libavcodec/aacsbr.c
libavcodec/rv34.c
libavcodec/sbr.h
libavcodec/x86/sbrdsp.asm
tests/fate/lossless-audio.mak