diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-24 10:59:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-24 10:59:43 +0100 |
| commit | f58f75dd92a5d8b48e23865f6d4a69ce70d0bd1c (patch) | |
| tree | 1345408bddb30de183f5945cb3673262554f16bb /libavcodec/sbr.h | |
| parent | b222c28ee885187c5fcded69d8fa98fe60c70a7e (diff) | |
| parent | cb7190cd2c691fd93e4d3664f3fce6c19ee001dd (diff) | |
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 'libavcodec/sbr.h')
| -rw-r--r-- | libavcodec/sbr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/sbr.h b/libavcodec/sbr.h index 01d7a97442..a9e5302836 100644 --- a/libavcodec/sbr.h +++ b/libavcodec/sbr.h @@ -133,6 +133,7 @@ typedef struct { unsigned kx[2]; ///M' and M respectively, M is the number of QMF subbands that use SBR. unsigned m[2]; + unsigned kx_and_m_pushed; ///The number of frequency bands in f_master unsigned n_master; SBRData data[2]; |