Commit eded4377 authored by Steve Lhomme's avatar Steve Lhomme Committed by Jean-Baptiste Kempf

avcodec:fourcc: return VLC_CODEC_UNKNOWN directly instead of 0

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent f16fcc17
...@@ -547,5 +547,5 @@ vlc_fourcc_t GetVlcFourcc( unsigned i_ffmpeg_codec ) ...@@ -547,5 +547,5 @@ vlc_fourcc_t GetVlcFourcc( unsigned i_ffmpeg_codec )
if( spu_codecs[i].i_codec == i_ffmpeg_codec ) if( spu_codecs[i].i_codec == i_ffmpeg_codec )
return spu_codecs[i].i_fourcc; return spu_codecs[i].i_fourcc;
} }
return 0; return VLC_CODEC_UNKNOWN;
} }
...@@ -358,9 +358,6 @@ int OpenDemux( vlc_object_t *p_this ) ...@@ -358,9 +358,6 @@ int OpenDemux( vlc_object_t *p_this )
es_out_id_t *es = NULL; es_out_id_t *es = NULL;
es_format_t es_fmt; es_format_t es_fmt;
const char *psz_type = "unknown"; const char *psz_type = "unknown";
vlc_fourcc_t fcc = GetVlcFourcc( cp->codec_id );
if( !fcc )
fcc = VLC_CODEC_UNKNOWN;
/* Do not use the cover art as a stream */ /* Do not use the cover art as a stream */
if( s->disposition == AV_DISPOSITION_ATTACHED_PIC ) if( s->disposition == AV_DISPOSITION_ATTACHED_PIC )
...@@ -369,6 +366,7 @@ int OpenDemux( vlc_object_t *p_this ) ...@@ -369,6 +366,7 @@ int OpenDemux( vlc_object_t *p_this )
continue; continue;
} }
vlc_fourcc_t fcc = GetVlcFourcc( cp->codec_id );
switch( cp->codec_type ) switch( cp->codec_type )
{ {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
......
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