diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:15:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:15:46 +0100 |
| commit | b27ba2e540b873fe8e50280a734194ada002a077 (patch) | |
| tree | ab788acddcf6a588e2007488defd2c763b6c7dba /libavcodec/mpeg4videodec.c | |
| parent | aeead427896a632c09c13c2b90ba096bf8678ef1 (diff) | |
| parent | 6e81597d5a89f64dfab5c7e99e46b4355139e324 (diff) | |
| download | ffmpeg-b27ba2e540b873fe8e50280a734194ada002a077.tar.gz | |
Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'
* commit '6e81597d5a89f64dfab5c7e99e46b4355139e324':
mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 aa8b9de297..8a934b5b2c 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2007,7 +2007,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) { @@ -2445,7 +2445,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, |