Merge commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07'

* commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07': mpeg4videodec: remove a write-only variable from MpegEncContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
cus · Nov 30, 2013 · f4c28ae · f4c28ae
2 parents 0cea39f + 8cebc9e
commit f4c28ae
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
@@ -1826,7 +1826,7 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb)
             s->sprite_warping_accuracy  = get_bits(gb, 2);
             s->sprite_brightness_change = get_bits1(gb);
             if (ctx->vol_sprite_usage == STATIC_SPRITE)
-                s->low_latency_sprite = get_bits1(gb);
+                skip_bits1(gb); // low_latency_sprite
         }
         // FIXME sadct disable bit if verid!=1 && shape not rect
 

diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
@@ -612,7 +612,6 @@ typedef struct MpegEncContext {
     int reduced_res_vop;
     int aspect_ratio_info; //FIXME remove
     int sprite_warping_accuracy;
-    int low_latency_sprite;
     int data_partitioning;           ///< data partitioning flag from header
     int partitioned_frame;           ///< is current frame partitioned
     int low_delay;                   ///< no reordering needed / has no b-frames