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:05 +0100 |
| commit | 6e81597d5a89f64dfab5c7e99e46b4355139e324 (patch) | |
| tree | 74f093c9091bdadcda475c58541201ee247f87ff /libavcodec/mpeg4videodec.c | |
| parent | 2992afda83a7d5c0a9ec45bdce76d8abbe0961c5 (diff) | |
| download | ffmpeg-6e81597d5a89f64dfab5c7e99e46b4355139e324.tar.gz | |
mpeg4videodec: move enhancement_type from MpegEncContext to 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 32ffbb8700..114d24598f 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1969,7 +1969,7 @@ no_cplx_est: h_sampling_factor_m = get_bits(gb, 5); v_sampling_factor_n = get_bits(gb, 5); v_sampling_factor_m = get_bits(gb, 5); - s->enhancement_type = get_bits1(gb); + ctx->enhancement_type = get_bits1(gb); if (h_sampling_factor_n == 0 || h_sampling_factor_m == 0 || v_sampling_factor_n == 0 || v_sampling_factor_m == 0) { @@ -2253,7 +2253,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) if (ctx->shape != RECT_SHAPE && s->pict_type != AV_PICTURE_TYPE_I) skip_bits1(gb); // vop shape coding type } else { - if (s->enhancement_type) { + if (ctx->enhancement_type) { int load_backward_shape = get_bits1(gb); if (load_backward_shape) av_log(s->avctx, AV_LOG_ERROR, |