[FFmpeg-cvslog] r23747 - in branches/0.6: . libavcodec/aacsbr.c

[siretart]

Author: siretart
Date: Thu Jun 24 07:46:58 2010
New Revision: 23747

Log:
10l: aacsbr: Fix f_master[2] calculation when k2diff == -1.



backport r23660 by alexc

Modified:
   branches/0.6/   (props changed)
   branches/0.6/libavcodec/aacsbr.c

Modified: branches/0.6/libavcodec/aacsbr.c
==============================================================================
--- branches/0.6/libavcodec/aacsbr.c	Thu Jun 24 01:44:48 2010	(r23746)
+++ branches/0.6/libavcodec/aacsbr.c	Thu Jun 24 07:46:58 2010	(r23747)
@@ -402,7 +402,7 @@ static int sbr_make_f_master(AACContext 
         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]++;
         }