aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2010-06-20 19:24:18 +0000
committerAlex Converse <alex.converse@gmail.com>2010-06-20 19:24:18 +0000
commitbd9e0e29055f611a34b1af9a4f5cea5e68c18ceb (patch)
treefa6013a4052d90463c1fd04427aac06f00015a23 /libavcodec
parent78ba1d39d9bda458dab955ba088dd503afa453c5 (diff)
downloadffmpeg-bd9e0e29055f611a34b1af9a4f5cea5e68c18ceb.tar.gz
10l: aacsbr: Fix f_master[2] calculation when k2diff == -1.
Originally committed as revision 23660 to svn://svn.ffmpeg.org/ffmpeg/trunk
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 c8ff299fe0..94707c9966 100644
--- a/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@ -393,7 +393,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]++;
}