mpeg4videodec: remove write-only sprite variables from MpegEncContext

diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index b6aeecc5c64f2f65153a8ddf638d88a86ab6744c..a14d2695e5f703389ff38d8b176e40835ffc7cb4 100644 (file)
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -1769,13 +1769,13 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb)
         if (ctx->vol_sprite_usage == STATIC_SPRITE ||
             ctx->vol_sprite_usage == GMC_SPRITE) {
             if (ctx->vol_sprite_usage == STATIC_SPRITE) {
-                s->sprite_width = get_bits(gb, 13);
+                skip_bits(gb, 13); // sprite_width
                 skip_bits1(gb); /* marker */
-                s->sprite_height = get_bits(gb, 13);
+                skip_bits(gb, 13); // sprite_height
                 skip_bits1(gb); /* marker */
-                s->sprite_left = get_bits(gb, 13);
+                skip_bits(gb, 13); // sprite_left
                 skip_bits1(gb); /* marker */
-                s->sprite_top = get_bits(gb, 13);
+                skip_bits(gb, 13); // sprite_top
                 skip_bits1(gb); /* marker */
             }
             s->num_sprite_warping_points = get_bits(gb, 6);

diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 8154600726f48413074ad87d36275ad3c98d5d70..32ebe90322105f3b6c3c6ffa5a734312696f1695 100644 (file)
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -579,10 +579,6 @@ typedef struct MpegEncContext {
     uint16_t pb_time;               ///< time distance between the last b and p,s,i frame
     uint16_t pp_field_time;
     uint16_t pb_field_time;         ///< like above, just for interlaced
-    int sprite_width;
-    int sprite_height;
-    int sprite_left;
-    int sprite_top;
     int sprite_brightness_change;
     int num_sprite_warping_points;
     int real_sprite_warping_points;