From eded43778efb5cf590d55ba231ccfa973ad2cfca Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Fri, 7 Jul 2017 09:35:44 +0200 Subject: [PATCH] avcodec:fourcc: return VLC_CODEC_UNKNOWN directly instead of 0 Signed-off-by: Jean-Baptiste Kempf --- modules/codec/avcodec/fourcc.c | 2 +- modules/demux/avformat/demux.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index 4f2a3cd422..3394920ad4 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -547,5 +547,5 @@ vlc_fourcc_t GetVlcFourcc( unsigned i_ffmpeg_codec ) if( spu_codecs[i].i_codec == i_ffmpeg_codec ) return spu_codecs[i].i_fourcc; } - return 0; + return VLC_CODEC_UNKNOWN; } diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c index 5bee83b00b..0d299a93d8 100644 --- a/modules/demux/avformat/demux.c +++ b/modules/demux/avformat/demux.c @@ -358,9 +358,6 @@ int OpenDemux( vlc_object_t *p_this ) es_out_id_t *es = NULL; es_format_t es_fmt; 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 */ if( s->disposition == AV_DISPOSITION_ATTACHED_PIC ) @@ -369,6 +366,7 @@ int OpenDemux( vlc_object_t *p_this ) continue; } + vlc_fourcc_t fcc = GetVlcFourcc( cp->codec_id ); switch( cp->codec_type ) { case AVMEDIA_TYPE_AUDIO: -- GitLab