summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-24 13:46:29 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-24 13:48:31 +0100
commit96398cc12332bd0bd8acf921bfa310ed12146efd (patch)
treee7bc6a504b34942d32d33620dc5f4712298a29fd /libavcodec
parentf41d409b7a6cc0295d45c4ac879f8df7d0cc9a76 (diff)
parent208f3abb917757743313da0da714e525e03159d2 (diff)
Merge commit '208f3abb917757743313da0da714e525e03159d2'
* commit '208f3abb917757743313da0da714e525e03159d2': aacsbr: always initialize max_qmf_subbands See: c6d3b3be1555257ff3f88da6b8dca2158dad2a85 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/aacsbr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c
index ebe2520c4a..f8ae42472d 100644
--- a/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@ -326,7 +326,7 @@ static int check_n_master(AVCodecContext *avctx, int n_master, int bs_xover_band
static int sbr_make_f_master(AACContext *ac, SpectralBandReplication *sbr,
SpectrumParameters *spectrum)
{
- unsigned int temp, max_qmf_subbands;
+ unsigned int temp, max_qmf_subbands = 0;
unsigned int start_min, stop_min;
int k;
const int8_t *sbr_offset_ptr;