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:35:13 +0100 |
| commit | 3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab (patch) | |
| tree | fd0746b73dfbbaa78c9e0c98ae2903057ef24465 /libavcodec/mpeg4videodec.c | |
| parent | e89247debd5276d57ce4a26516224204f9541af0 (diff) | |
| download | ffmpeg-3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab.tar.gz | |
mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index e2ad7941eb..b1bcd38e07 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1940,8 +1940,8 @@ no_cplx_est: ctx->rvlc = get_bits1(gb); if (vo_ver_id != 1) { - s->new_pred = get_bits1(gb); - if (s->new_pred) { + ctx->new_pred = get_bits1(gb); + if (ctx->new_pred) { av_log(s->avctx, AV_LOG_ERROR, "new pred not supported\n"); skip_bits(gb, 2); /* requested upstream message type */ skip_bits1(gb); /* newpred segment type */ @@ -1950,7 +1950,7 @@ no_cplx_est: av_log(s->avctx, AV_LOG_ERROR, "reduced resolution VOP not supported\n"); } else { - s->new_pred = 0; + ctx->new_pred = 0; } s->scalability = get_bits1(gb); |