diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:26:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:27:30 +0100 |
| commit | 9c835acc1da49919449f11d2f86b3422aee85ea0 (patch) | |
| tree | 16af0df43149b7fabe72363237707dfe7caa2374 /libavcodec | |
| parent | cdc21e4abe2a0e9394638bb09086ac2068f0683b (diff) | |
| parent | bc5abfb19e7ff00b859120561d6ffd622c7904fe (diff) | |
| download | ffmpeg-9c835acc1da49919449f11d2f86b3422aee85ea0.tar.gz | |
Merge commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe'
* commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe':
mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg4video.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 6 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 | ||||
| -rw-r--r-- | libavcodec/vaapi_mpeg4.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index 2cf23182f9..d06f54cd8a 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -66,6 +66,8 @@ typedef struct Mpeg4DecContext { int time_increment_bits; int shape; int vol_sprite_usage; + // reversible vlc + int rvlc; } Mpeg4DecContext; /* dc encoding for mpeg4 */ 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 " : "" ); } diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index a95bc2a6a1..468c82da7b 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -615,7 +615,6 @@ typedef struct MpegEncContext { int low_latency_sprite; int data_partitioning; ///< data partitioning flag from header int partitioned_frame; ///< is current frame partitioned - int rvlc; ///< reversible vlc int resync_marker; ///< could this stream contain resync markers int low_delay; ///< no reordering needed / has no b-frames int vo_type; diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index f64245fcad..d54596661f 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -71,7 +71,7 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_ pic_param->vol_fields.bits.quant_type = s->mpeg_quant; pic_param->vol_fields.bits.quarter_sample = s->quarter_sample; pic_param->vol_fields.bits.data_partitioned = s->data_partitioning; - pic_param->vol_fields.bits.reversible_vlc = s->rvlc; + pic_param->vol_fields.bits.reversible_vlc = ctx->rvlc; pic_param->vol_fields.bits.resync_marker_disable = !s->resync_marker; pic_param->no_of_sprite_warping_points = s->num_sprite_warping_points; for (i = 0; i < s->num_sprite_warping_points && i < 3; i++) { |