diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-26 11:23:16 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-29 14:19:47 +0100 |
| commit | bc5abfb19e7ff00b859120561d6ffd622c7904fe (patch) | |
| tree | 543288b4b8975e1c31cfdb803b8b7c783586e5af /libavcodec/mpeg4videodec.c | |
| parent | 9f0617d2137bb7231b181d74392cd84ef4844cd7 (diff) | |
| download | ffmpeg-bc5abfb19e7ff00b859120561d6ffd622c7904fe.tar.gz | |
mpeg4videodec: move MpegEncContext.rvlc 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 a14d2695e5..65d51e2c41 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1226,7 +1226,7 @@ static int mpeg4_decode_partitioned_mb(MpegEncContext *s, int16_t block[6][64]) s->dsp.clear_blocks(s->block[0]); /* decode each block */ for (i = 0; i < 6; i++) { - if (mpeg4_decode_block(s, block[i], i, cbp & 32, s->mb_intra, s->rvlc) < 0) { + if (mpeg4_decode_block(s, block[i], i, cbp & 32, s->mb_intra, ctx->rvlc) < 0) { av_log(s->avctx, AV_LOG_ERROR, "texture corrupted at %d %d %d\n", s->mb_x, s->mb_y, s->mb_intra); @@ -1935,7 +1935,7 @@ no_cplx_est: s->data_partitioning = get_bits1(gb); if (s->data_partitioning) - s->rvlc = get_bits1(gb); + ctx->rvlc = get_bits1(gb); if (vo_ver_id != 1) { s->new_pred = get_bits1(gb); |