summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2010-06-24 05:46:58 +0000
committerReinhard Tartler <siretart@tauware.de>2010-06-24 05:46:58 +0000
commitb9ebd7dc7d6e22f2c2bcbc8709897fe44798146a (patch)
tree11351b8ab39b7367480b345d4dde33413c130cdb
parent55b6e09e5e68074a2fdee184ea23596ba735eeb5 (diff)
10l: aacsbr: Fix f_master[2] calculation when k2diff == -1.
backport r23660 by alexc Originally committed as revision 23747 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
-rw-r--r--libavcodec/aacsbr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c
index 0de81a5025..0de89c2315 100644
--- a/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@ -402,7 +402,7 @@ static int sbr_make_f_master(AACContext *ac, SpectralBandReplication *sbr,
k2diff = sbr->k[2] - sbr->k[0] - sbr->n_master * dk;
if (k2diff < 0) {
sbr->f_master[1]--;
- sbr->f_master[2]-= (k2diff < 1);
+ sbr->f_master[2]-= (k2diff < -1);
} else if (k2diff) {
sbr->f_master[sbr->n_master]++;
}