Commit 7045d671 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

avformat: remove unused GetVlcFourcc() arguments

parent 62050119
......@@ -27,8 +27,7 @@
/* VLC <-> avcodec tables */
int GetFfmpegCodec( vlc_fourcc_t i_fourcc, int *pi_cat,
unsigned *pi_ffmpeg_codec, const char **ppsz_name );
int GetVlcFourcc( unsigned i_ffmpeg_codec, int *pi_cat,
vlc_fourcc_t *pi_fourcc, const char **ppsz_name );
vlc_fourcc_t GetVlcFourcc( unsigned i_ffmpeg_codec );
vlc_fourcc_t GetVlcAudioFormat( int i_sample_fmt );
/* Video encoder module */
......
......@@ -508,19 +508,12 @@ int GetFfmpegCodec( vlc_fourcc_t i_fourcc, int *pi_cat,
return false;
}
int GetVlcFourcc( unsigned i_ffmpeg_codec, int *pi_cat,
vlc_fourcc_t *pi_fourcc, const char **ppsz_name )
vlc_fourcc_t GetVlcFourcc( unsigned i_ffmpeg_codec )
{
for( unsigned i = 0; i < codecs_count; i++ )
{
if( codecs_table[i].i_codec == i_ffmpeg_codec )
{
if( pi_cat ) *pi_cat = codecs_table[i].i_cat;
if( pi_fourcc ) *pi_fourcc = codecs_table[i].i_fourcc;
if( ppsz_name ) *ppsz_name = vlc_fourcc_GetDescription( codecs_table[i].i_cat, codecs_table[i].i_fourcc );
return true;
}
return codecs_table[i].i_fourcc;
}
return false;
return 0;
}
......@@ -373,10 +373,9 @@ int OpenDemux( vlc_object_t *p_this )
const AVCodecParameters *cp = s->codecpar;
es_out_id_t *es = NULL;
es_format_t fmt;
vlc_fourcc_t fcc;
const char *psz_type = "unknown";
if( !GetVlcFourcc( cp->codec_id, NULL, &fcc, NULL ) )
vlc_fourcc_t fcc = GetVlcFourcc( cp->codec_id );
if( !fcc )
fcc = VLC_FOURCC( 'u', 'n', 'd', 'f' );
#if LIBAVFORMAT_VERSION_INT >= ((54<<16)+(2<<8)+0)
......
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