From 9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 26 Nov 2013 14:34:52 +0100 Subject: mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext --- libavcodec/mpeg4videodec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/mpeg4videodec.c') diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 2e320cd968..20dd14bc9e 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1789,7 +1789,7 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) return -1; } s->sprite_warping_accuracy = get_bits(gb, 2); - s->sprite_brightness_change = get_bits1(gb); + ctx->sprite_brightness_change = get_bits1(gb); if (ctx->vol_sprite_usage == STATIC_SPRITE) skip_bits1(gb); // low_latency_sprite } @@ -2204,7 +2204,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) ctx->vol_sprite_usage == GMC_SPRITE)) { if (mpeg4_decode_sprite_trajectory(ctx, gb) < 0) return AVERROR_INVALIDDATA; - if (s->sprite_brightness_change) + if (ctx->sprite_brightness_change) av_log(s->avctx, AV_LOG_ERROR, "sprite_brightness_change not supported\n"); if (ctx->vol_sprite_usage == STATIC_SPRITE) -- cgit v1.2.3