[vlc-commits] avcodec: remove redundant decoder_sys_t.i_cat

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Sep 11 23:03:31 2014 +0300| [d1d268a31b2d2310f832cb1373c746eeba03d2ce] | committer: Rémi Denis-Courmont

avcodec: remove redundant decoder_sys_t.i_cat

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d1d268a31b2d2310f832cb1373c746eeba03d2ce
---

 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 6fd4ca6..51ad5fb 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 1928f46..44302d0 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;  \