aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/libmpcodecs
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-24 10:59:43 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-24 10:59:43 +0100
commitf58f75dd92a5d8b48e23865f6d4a69ce70d0bd1c (patch)
tree1345408bddb30de183f5945cb3673262554f16bb /libavfilter/libmpcodecs
parentb222c28ee885187c5fcded69d8fa98fe60c70a7e (diff)
parentcb7190cd2c691fd93e4d3664f3fce6c19ee001dd (diff)
downloadffmpeg-f58f75dd92a5d8b48e23865f6d4a69ce70d0bd1c.tar.gz
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>
Diffstat (limited to 'libavfilter/libmpcodecs')
0 files changed, 0 insertions, 0 deletions