On Tue, Nov 26, 2013 at 3:52 PM, Anton Khirnov <an...@khirnov.net> wrote:
> ---
> libavcodec/mpeg4videodec.c | 8 ++++----
> libavcodec/mpegvideo.h | 4 ----
> 2 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
> index b6aeecc..a14d269 100644
> --- 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 */
> }
nit: can't you do skip_bits(gb, 14 * 4) and describe in a comment what
you are skipping?
> s->num_sprite_warping_points = get_bits(gb, 6);
> diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
> index 8154600..32ebe90 100644
> --- 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;
Ok
Vittorio
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
