Merge commit '9f0617d2'

* commit '9f0617d2':
  mpeg4videodec: remove write-only sprite variables from MpegEncContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/mpeg4videodec.c

@@ -1803,13 +1803,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);

libavcodec/mpegvideo.h

@@ -595,10 +595,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;