From d1d268a31b2d2310f832cb1373c746eeba03d2ce Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 11 Sep 2014 23:03:31 +0300 Subject: [PATCH] avcodec: remove redundant decoder_sys_t.i_cat --- modules/codec/avcodec/avcodec.c | 3 +-- modules/codec/avcodec/avcodec.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c index 6fd4ca685f..51ad5fbfe7 100644 --- a/modules/codec/avcodec/avcodec.c +++ b/modules/codec/avcodec/avcodec.c @@ -315,7 +315,6 @@ static int OpenDecoder( vlc_object_t *p_this ) if( i_result == VLC_SUCCESS ) { - p_dec->p_sys->i_cat = i_cat; if( p_context->profile != FF_PROFILE_UNKNOWN) p_dec->fmt_in.i_profile = p_context->profile; if( p_context->level != FF_LEVEL_UNKNOWN) @@ -333,7 +332,7 @@ static void CloseDecoder( vlc_object_t *p_this ) decoder_t *p_dec = (decoder_t *)p_this; decoder_sys_t *p_sys = p_dec->p_sys; - switch( p_sys->i_cat ) + switch( p_dec->fmt_out.i_cat ) { case VIDEO_ES: EndVideoDec ( p_dec ); diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h index 1928f46dc8..44302d0b0b 100644 --- a/modules/codec/avcodec/avcodec.h +++ b/modules/codec/avcodec/avcodec.h @@ -243,7 +243,6 @@ int ffmpeg_OpenCodec( decoder_t *p_dec ); "hev1 and hev2 are currently supported only with libfdk-aac enabled libavcodec" ) #define AVCODEC_COMMON_MEMBERS \ - int i_cat; \ int i_codec_id; \ const char *psz_namecodec; \ AVCodecContext *p_context; \ -- 2.39.2