diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:29:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:29:26 +0100 |
| commit | 4c55aa8f93c61b33d44b8d23e20ae78a72249bf6 (patch) | |
| tree | ccb8b6fcddb0b44f6a7d734fd3790eec1ce767d0 | |
| parent | ae4e7f7ba603a1624d4aaeee2c368677739b7322 (diff) | |
| parent | 9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091 (diff) | |
| download | ffmpeg-4c55aa8f93c61b33d44b8d23e20ae78a72249bf6.tar.gz | |
Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'
* commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091':
mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpeg4video.h | 1 | ||||
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index d8751f7615..4d13382f30 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -66,6 +66,7 @@ typedef struct Mpeg4DecContext { int time_increment_bits; int shape; int vol_sprite_usage; + int sprite_brightness_change; // reversible vlc int rvlc; ///< could this stream contain resync markers diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index bda8c5e820..5ccd18a13b 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1824,7 +1824,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 } @@ -2386,7 +2386,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) diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index acc047c3fd..4a6d20f395 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -595,7 +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_brightness_change; int num_sprite_warping_points; int real_sprite_warping_points; uint16_t sprite_traj[4][2]; ///< sprite trajectory points |