diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-26 14:34:52 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-29 17:36:57 +0100 |
| commit | 513d849bb605d3d862da1ada709bd2ca1ac68f58 (patch) | |
| tree | 6424cfe4e0729830a19ce4b367d9a3d2ac88912d /libavcodec/mpeg4videodec.c | |
| parent | 9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091 (diff) | |
mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 20dd14bc9e..f8bb54c4c8 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -172,7 +172,7 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *g if (w <= 0 || h <= 0) return AVERROR_INVALIDDATA; - for (i = 0; i < s->num_sprite_warping_points; i++) { + for (i = 0; i < ctx->num_sprite_warping_points; i++) { int length; int x = 0, y = 0; @@ -240,7 +240,7 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *g ROUNDED_DIV(((h - h2) * (r * sprite_ref[0][1] - 16 * vop_ref[0][1]) + h2 * (r * sprite_ref[2][1] - 16 * vop_ref[2][1])), h); - switch (s->num_sprite_warping_points) { + switch (ctx->num_sprite_warping_points) { case 0: s->sprite_offset[0][0] = s->sprite_offset[0][1] = @@ -359,7 +359,7 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *g s->sprite_delta[1][i] <<= shift_y; s->sprite_shift[i] = 16; } - s->real_sprite_warping_points = s->num_sprite_warping_points; + s->real_sprite_warping_points = ctx->num_sprite_warping_points; } return 0; @@ -1780,12 +1780,12 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) skip_bits(gb, 13); // sprite_top skip_bits1(gb); /* marker */ } - s->num_sprite_warping_points = get_bits(gb, 6); - if (s->num_sprite_warping_points > 3) { + ctx->num_sprite_warping_points = get_bits(gb, 6); + if (ctx->num_sprite_warping_points > 3) { av_log(s->avctx, AV_LOG_ERROR, "%d sprite_warping_points\n", - s->num_sprite_warping_points); - s->num_sprite_warping_points = 0; + ctx->num_sprite_warping_points); + ctx->num_sprite_warping_points = 0; return -1; } s->sprite_warping_accuracy = get_bits(gb, 2); @@ -2242,7 +2242,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) gb->size_in_bits, s->progressive_sequence, s->alternate_scan, s->top_field_first, s->quarter_sample ? "q" : "h", s->data_partitioning, ctx->resync_marker, - s->num_sprite_warping_points, s->sprite_warping_accuracy, + ctx->num_sprite_warping_points, s->sprite_warping_accuracy, 1 - s->no_rounding, s->vo_type, s->vol_control_parameters ? " VOLC" : " ", s->intra_dc_threshold, ctx->cplx_estimation_trash_i, ctx->cplx_estimation_trash_p, |