diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 02:26:07 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 02:27:30 +0400 |
| commit | 9c835acc1da49919449f11d2f86b3422aee85ea0 (patch) | |
| tree | 16af0df43149b7fabe72363237707dfe7caa2374 /libavcodec/mpeg4videodec.c | |
| parent | cdc21e4abe2a0e9394638bb09086ac2068f0683b (diff) | |
| parent | bc5abfb19e7ff00b859120561d6ffd622c7904fe (diff) | |
Merge commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe'
* commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe':
mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 895bf30401..369a85c028 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1256,7 +1256,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); @@ -1972,7 +1972,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); @@ -2028,7 +2028,7 @@ no_cplx_est: s->quant_precision, s->progressive_sequence, s->scalability ? "scalability " :"" , s->quarter_sample ? "qpel " : "", - s->data_partitioning ? "partition " : "", s->rvlc ? "rvlc " : "" + s->data_partitioning ? "partition " : "", ctx->rvlc ? "rvlc " : "" ); } |