[FFmpeg-cvslog] r23660 - trunk/libavcodec/aacsbr.c

[Alex Converse]

On Sun, Jun 20, 2010 at 3:24 PM, alexc <subversion at mplayerhq.hu> wrote:
> Author: alexc
> Date: Sun Jun 20 21:24:18 2010
> New Revision: 23660
>
> Log:
> 10l: aacsbr: Fix f_master[2] calculation when k2diff == -1.
>
> Modified:
> ? trunk/libavcodec/aacsbr.c
>
> Modified: trunk/libavcodec/aacsbr.c
> ==============================================================================
> --- trunk/libavcodec/aacsbr.c ? Sun Jun 20 19:28:52 2010 ? ? ? ?(r23659)
> +++ trunk/libavcodec/aacsbr.c ? Sun Jun 20 21:24:18 2010 ? ? ? ?(r23660)
> @@ -393,7 +393,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]++;
> ? ? ? ? }

I'd like to nominate this for the 0.6 branch if we are backporting small fixes