Commit ca33555c authored by Gildas Bazin's avatar Gildas Bazin

* modules/codec/mpeg_video/parser.c: add_module() for "mpeg-motion" wasn't using
   the right capability.
* modules/codec/ffmpeg/ffmpeg.c: fixed typo (re-enabled default case in a
   switch).
* modules/codec/a52.c: fixed the AOUT_DOLBY detection.
parent 50d45d76
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* a52.c: A/52 basic parser * a52.c: A/52 basic parser
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2002 VideoLAN * Copyright (C) 2001-2002 VideoLAN
* $Id: a52.c,v 1.16 2002/10/27 16:58:14 gbazin Exp $ * $Id: a52.c,v 1.17 2002/10/28 22:23:23 gbazin Exp $
* *
* Authors: Stphane Borel <stef@via.ecp.fr> * Authors: Stphane Borel <stef@via.ecp.fr>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -291,7 +291,7 @@ int SyncInfo( const byte_t * p_buf, int * pi_channels, int * pi_sample_rate, ...@@ -291,7 +291,7 @@ int SyncInfo( const byte_t * p_buf, int * pi_channels, int * pi_sample_rate,
/* acmod, dsurmod and lfeon */ /* acmod, dsurmod and lfeon */
acmod = p_buf[6] >> 5; acmod = p_buf[6] >> 5;
if ( p_buf[6] & 0xf8 ) if ( (p_buf[6] & 0xf8) == 0x50 )
{ {
*pi_channels = AOUT_CHAN_DOLBY; *pi_channels = AOUT_CHAN_DOLBY;
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ffmpeg.c: video decoder using ffmpeg library * ffmpeg.c: video decoder using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: ffmpeg.c,v 1.12 2002/10/28 06:26:11 fenrir Exp $ * $Id: ffmpeg.c,v 1.13 2002/10/28 22:23:23 gbazin Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -493,15 +493,13 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc, ...@@ -493,15 +493,13 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
i_codec = CODEC_ID_WMAV2; i_codec = CODEC_ID_WMAV2;
psz_name ="Windows Media Audio 2"; psz_name ="Windows Media Audio 2";
break; break;
#endif
default: default:
i_cat = UNKNOWN_ES; i_cat = UNKNOWN_ES;
i_codec = CODEC_ID_NONE; i_codec = CODEC_ID_NONE;
psz_name = NULL; psz_name = NULL;
break; break;
#endif
} }
if( i_codec != CODEC_ID_NONE ) if( i_codec != CODEC_ID_NONE )
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* video_parser.c : video parser thread * video_parser.c : video parser thread
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: parser.c,v 1.5 2002/10/27 16:58:13 gbazin Exp $ * $Id: parser.c,v 1.6 2002/10/28 22:23:23 gbazin Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr> * Samuel Hocevar <sam@via.ecp.fr>
...@@ -87,8 +87,8 @@ vlc_module_begin(); ...@@ -87,8 +87,8 @@ vlc_module_begin();
add_category_hint( N_("Miscellaneous"), NULL ); add_category_hint( N_("Miscellaneous"), NULL );
add_module ( "mpeg-idct", "idct", NULL, NULL, add_module ( "mpeg-idct", "idct", NULL, NULL,
VDEC_IDCT_TEXT, VDEC_IDCT_LONGTEXT ); VDEC_IDCT_TEXT, VDEC_IDCT_LONGTEXT );
add_module ( "mpeg-motion", "motion", NULL, NULL, add_module ( "mpeg-motion", "motion compensation", NULL, NULL,
VDEC_MOTION_TEXT, VDEC_IDCT_LONGTEXT ); VDEC_MOTION_TEXT, VDEC_MOTION_LONGTEXT );
add_integer ( "vdec-smp", 0, NULL, VDEC_SMP_TEXT, VDEC_SMP_LONGTEXT ); add_integer ( "vdec-smp", 0, NULL, VDEC_SMP_TEXT, VDEC_SMP_LONGTEXT );
add_string ( "vpar-synchro", NULL, NULL, VPAR_SYNCHRO_TEXT, add_string ( "vpar-synchro", NULL, NULL, VPAR_SYNCHRO_TEXT,
VPAR_SYNCHRO_LONGTEXT ); VPAR_SYNCHRO_LONGTEXT );
......
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