Commit 668ce22d authored by Laurent Aimar's avatar Laurent Aimar

* aac: compilation fix.

 * libvlc.h : set correct value for sout-a/vcodec
parent 8c59018c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* demux.c : Raw aac Stream input module for vlc * demux.c : Raw aac Stream input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: demux.c,v 1.9 2003/05/14 14:58:35 fenrir Exp $ * $Id: demux.c,v 1.10 2003/05/14 21:29:42 fenrir Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -409,9 +409,9 @@ static int Activate( vlc_object_t * p_this ) ...@@ -409,9 +409,9 @@ static int Activate( vlc_object_t * p_this )
int i_skip; int i_skip;
int b_forced = VLC_FALSE; int b_forced = VLC_FALSE;
if( *p_input->psz_demux != NULL && !strncmp( p_input->psz_demux, "aac", 3 ) ) if( p_input->psz_demux && !strncmp( p_input->psz_demux, "aac", 3 ) )
{ {
b_force = VLC_TRUE; b_forced = VLC_TRUE;
} }
else if( p_input->psz_name ) else if( p_input->psz_name )
{ {
...@@ -419,7 +419,7 @@ static int Activate( vlc_object_t * p_this ) ...@@ -419,7 +419,7 @@ static int Activate( vlc_object_t * p_this )
if( i_len > 4 && !strcasecmp( &p_input->psz_name[i_len - 4], ".aac" ) ) if( i_len > 4 && !strcasecmp( &p_input->psz_name[i_len - 4], ".aac" ) )
{ {
b_force = VLC_TRUE; b_forced = VLC_TRUE;
} }
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* libvlc.h: main libvlc header * libvlc.h: main libvlc header
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2002 VideoLAN * Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.h,v 1.65 2003/05/10 20:49:07 hartman Exp $ * $Id: libvlc.h,v 1.66 2003/05/14 21:29:43 fenrir Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -25,8 +25,9 @@ ...@@ -25,8 +25,9 @@
#define Nothing here, this is just to prevent update-po from being stupid #define Nothing here, this is just to prevent update-po from being stupid
static char *ppsz_sout_acodec[] = { "", "mpeg1", "mpeg2", "mpeg4", "vorbis", NULL }; static char *ppsz_sout_acodec[] = { "", "mpga", "a52", NULL };
static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; static char *ppsz_sout_vcodec[] = { "", "mpgv", "mp4v", "DIV3", "h263", NULL };
static char *ppsz_language[] = { "auto", "de", "en_GB", "fr", "it", static char *ppsz_language[] = { "auto", "de", "en_GB", "fr", "it",
"ja", "nl", "no", "pl", "ru", "sv", NULL }; "ja", "nl", "no", "pl", "ru", "sv", NULL };
......
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