mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext
authorAnton Khirnov <anton@khirnov.net>
Tue, 26 Nov 2013 13:34:52 +0000 (14:34 +0100)
committerAnton Khirnov <anton@khirnov.net>
Fri, 29 Nov 2013 16:36:05 +0000 (17:36 +0100)
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.h

index 6a143e1..6337a08 100644 (file)
@@ -74,6 +74,7 @@ typedef struct Mpeg4DecContext {
     int t_frame;
 
     int new_pred;
     int t_frame;
 
     int new_pred;
+    int enhancement_type;
 
     /* bug workarounds */
     int divx_version;
 
     /* bug workarounds */
     int divx_version;
index 32ffbb8..114d245 100644 (file)
@@ -1969,7 +1969,7 @@ no_cplx_est:
             h_sampling_factor_m = get_bits(gb, 5);
             v_sampling_factor_n = get_bits(gb, 5);
             v_sampling_factor_m = get_bits(gb, 5);
             h_sampling_factor_m = get_bits(gb, 5);
             v_sampling_factor_n = get_bits(gb, 5);
             v_sampling_factor_m = get_bits(gb, 5);
-            s->enhancement_type = get_bits1(gb);
+            ctx->enhancement_type = get_bits1(gb);
 
             if (h_sampling_factor_n == 0 || h_sampling_factor_m == 0 ||
                 v_sampling_factor_n == 0 || v_sampling_factor_m == 0) {
 
             if (h_sampling_factor_n == 0 || h_sampling_factor_m == 0 ||
                 v_sampling_factor_n == 0 || v_sampling_factor_m == 0) {
@@ -2253,7 +2253,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
             if (ctx->shape != RECT_SHAPE && s->pict_type != AV_PICTURE_TYPE_I)
                 skip_bits1(gb);  // vop shape coding type
         } else {
             if (ctx->shape != RECT_SHAPE && s->pict_type != AV_PICTURE_TYPE_I)
                 skip_bits1(gb);  // vop shape coding type
         } else {
-            if (s->enhancement_type) {
+            if (ctx->enhancement_type) {
                 int load_backward_shape = get_bits1(gb);
                 if (load_backward_shape)
                     av_log(s->avctx, AV_LOG_ERROR,
                 int load_backward_shape = get_bits1(gb);
                 if (load_backward_shape)
                     av_log(s->avctx, AV_LOG_ERROR,
index 97a3a72..55e61da 100644 (file)
@@ -590,7 +590,6 @@ typedef struct MpegEncContext {
     int quant_precision;
     int quarter_sample;              ///< 1->qpel, 0->half pel ME/MC
     int scalability;
     int quant_precision;
     int quarter_sample;              ///< 1->qpel, 0->half pel ME/MC
     int scalability;
-    int enhancement_type;
     int aspect_ratio_info; //FIXME remove
     int sprite_warping_accuracy;
     int data_partitioning;           ///< data partitioning flag from header
     int aspect_ratio_info; //FIXME remove
     int sprite_warping_accuracy;
     int data_partitioning;           ///< data partitioning flag from header