diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-26 12:18:44 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-29 14:19:47 +0100 |
| commit | 48e139409556861c9e561ce34133891d8eecc3cf (patch) | |
| tree | f6ac4af6aa5b17856d4e78713a0d2c4f3b27286e /libavcodec/mpeg4videodec.c | |
| parent | c2f7417eeb9cc31f75e71f7be2780f90f1628d7e (diff) | |
| download | ffmpeg-48e139409556861c9e561ce34133891d8eecc3cf.tar.gz | |
mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 65d51e2c41..8511dc3d0d 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1931,7 +1931,7 @@ no_cplx_est: s->cplx_estimation_trash_b = 0; } - s->resync_marker = !get_bits1(gb); /* resync_marker_disabled */ + ctx->resync_marker = !get_bits1(gb); /* resync_marker_disabled */ s->data_partitioning = get_bits1(gb); if (s->data_partitioning) @@ -2240,7 +2240,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) s->pict_type == AV_PICTURE_TYPE_I ? "I" : (s->pict_type == AV_PICTURE_TYPE_P ? "P" : (s->pict_type == AV_PICTURE_TYPE_B ? "B" : "S")), gb->size_in_bits, s->progressive_sequence, s->alternate_scan, s->top_field_first, s->quarter_sample ? "q" : "h", - s->data_partitioning, s->resync_marker, + s->data_partitioning, ctx->resync_marker, s->num_sprite_warping_points, s->sprite_warping_accuracy, 1 - s->no_rounding, s->vo_type, s->vol_control_parameters ? " VOLC" : " ", s->intra_dc_threshold, |