[MPlayer-cvslog] r31543 - in trunk: libfaad2/decoder.c libfaad2/decoder.h libfaad2/neaacdec.h libmpcodecs/ad_faad.c

[Diego Biurrun]

On Wed, Jun 23, 2010 at 08:44:06PM +0200, cehoyos wrote:
> 
> Log:
> Improve LATM recognition.
> 
> Patch by Dan Oscarsson,  Dan d Oscarsson a tieto d com
> 
> --- trunk/libmpcodecs/ad_faad.c	Wed Jun 23 19:34:19 2010	(r31542)
> +++ trunk/libmpcodecs/ad_faad.c	Wed Jun 23 20:44:06 2010	(r31543)
> @@ -126,6 +126,26 @@ static int init(sh_audio_t *sh)
>      faacDecSetConfiguration(faac_hdec, faac_conf);
>  
>      sh->a_in_buffer_len = demux_read_data(sh->ds, sh->a_in_buffer, sh->a_in_buffer_size);
> +    /* init the codec, look for LATM */
> +    faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
> +                            sh->a_in_buffer_len, &faac_samplerate, &faac_channels,1);

There should be a space after each comma.

> +    if (faac_init < 0 && sh->a_in_buffer_len >= 3 && sh->format == mmioFOURCC('M', 'P', '4', 'L')) {

pointless long line

> +            faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
> +                                    sh->a_in_buffer_len, &faac_samplerate, &faac_channels,1);

ditto

> @@ -138,7 +158,8 @@ static int init(sh_audio_t *sh)
>  
>      /* init the codec */
>      faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
> -       sh->a_in_buffer_len, &faac_samplerate, &faac_channels);
> +          sh->a_in_buffer_len, &faac_samplerate, &faac_channels,0);

ditto

> +    }

Indentation is now wrong.

Diego