Skip to content

V
vlc-gpu
Commit faf0b184 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/codec/ffmpeg/ffmpeg.c: CODEC_ID_MP3 is only available on recent ffmpeg versions.
parent 7f257862
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/codec/ffmpeg/ffmpeg.c
View file @ faf0b184
...@@ -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.56 2003/10/27 17:50:54 gbazin Exp $ * $Id: ffmpeg.c,v 1.57 2003/10/29 19:35:43 gbazin 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>
...@@ -150,7 +150,7 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -150,7 +150,7 @@ static int OpenDecoder( vlc_object_t *p_this )
if( !avcodec_find_decoder( i_codec_id ) ) if( !avcodec_find_decoder( i_codec_id ) )
{ {
msg_Err( p_dec, "codec not found (%s)", psz_namecodec ); msg_Dbg( p_dec, "codec not found (%s)", psz_namecodec );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -617,7 +617,7 @@ int E_(GetFfmpegCodec)( vlc_fourcc_t i_fourcc, int *pi_cat, ...@@ -617,7 +617,7 @@ int E_(GetFfmpegCodec)( vlc_fourcc_t i_fourcc, int *pi_cat,
break; break;
case VLC_FOURCC('m','p','3',' '): case VLC_FOURCC('m','p','3',' '):
i_cat = AUDIO_ES; i_cat = AUDIO_ES;
i_codec = CODEC_ID_MP3; i_codec = CODEC_ID_MP3LAME;
psz_name = "MPEG Audio layer 1/2/3"; psz_name = "MPEG Audio layer 1/2/3";
break; break;
......
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