avcodec/wmv2: Split Wmv2Context into decoder and encoder context

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

1 files changed, 3 insertions, 23 deletions

diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h
index 1798dbabcd..4001093881 100644
--- a/libavcodec/wmv2.h
+++ b/libavcodec/wmv2.h
@@ -21,9 +21,6 @@
 #ifndef AVCODEC_WMV2_H
 #define AVCODEC_WMV2_H
 
-#include "libavutil/mem_internal.h"
-
-#include "intrax8.h"
 #include "mpegvideo.h"
 #include "wmv2dsp.h"
 
@@ -33,29 +30,12 @@
 #define SKIP_TYPE_COL  3
 
 
-typedef struct Wmv2Context {
-    MpegEncContext s;
-    IntraX8Context x8;
+typedef struct WMV2Context {
     WMV2DSPContext wdsp;
-    int j_type_bit;
-    int j_type;
-    int abt_flag;
-    int abt_type;
-    int abt_type_table[6];
-    int per_mb_abt;
-    int per_block_abt;
-    int mspel_bit;
-    int cbp_table_index;
-    int top_left_mv_flag;
-    int per_mb_rl_bit;
-    int skip_type;
     int hshift;
+} WMV2Context;
 
-    ScanTable abt_scantable[2];
-    DECLARE_ALIGNED(32, int16_t, abt_block2)[6][64];
-} Wmv2Context;
-
-void ff_wmv2_common_init(Wmv2Context *w);
+void ff_wmv2_common_init(MpegEncContext *s);
 
 int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]);
 int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number);