Skip to content

V
vlc-1.1
Commit d46292cb authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Correct fix for iPAQ. (do not mix watching your kids and coding, it doesn't mix ;-))

parent e1b3ef17
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/codec/faad.c
View file @ d46292cb
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* decoder.c: AAC decoder using libfaad2 * decoder.c: AAC decoder using libfaad2
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2003 VideoLAN * Copyright (C) 2001, 2003 VideoLAN
* $Id: faad.c,v 1.12 2004/02/19 16:19:41 gbazin Exp $ * $Id: faad.c,v 1.13 2004/02/19 17:42:43 jpsaman Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com> * Gildas Bazin <gbazin@netcourrier.com>
...@@ -116,7 +116,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -116,7 +116,7 @@ static int Open( vlc_object_t *p_this )
aout_DateSet( &p_sys->date, 0 ); aout_DateSet( &p_sys->date, 0 );
p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_cat = AUDIO_ES;
if (p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_FPU) if (p_this->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2'); p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
else else
p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE; p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
...@@ -151,7 +151,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -151,7 +151,7 @@ static int Open( vlc_object_t *p_this )
/* Set the faad config */ /* Set the faad config */
cfg = faacDecGetCurrentConfiguration( p_sys->hfaad ); cfg = faacDecGetCurrentConfiguration( p_sys->hfaad );
if (p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_FPU) if (p_this->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
cfg->outputFormat = FAAD_FMT_FLOAT; cfg->outputFormat = FAAD_FMT_FLOAT;
else else
cfg->outputFormat = FAAD_FMT_16BIT; cfg->outputFormat = FAAD_FMT_16BIT;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment