avcodec: remove redundant decoder_sys_t.i_cat

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 6fd4ca685fb0e18e17d13b41c326db4e8c50e91e..51ad5fbfe73ded68f3c86caccecfc8dd52ac7ad2 100644 (file)
--- 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 1928f46dc82f0a970b668d989cc65277fdb5cc3d..44302d0b0baca4c46c92c0cccb0058c74a443b54 100644 (file)
--- 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;  \