diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:38:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:38:55 +0100 |
| commit | 36e2ec40688d0c3c350d31fae00a54f6a23b7647 (patch) | |
| tree | 80cf0550bc36f8b772d1cfbc83b1ea48e988ac45 /libavcodec/mpeg4videodec.c | |
| parent | db7580b4f6b2217917aa6f372e3a18dfca43624a (diff) | |
| parent | f7d228676cb7669059889c4225c8a8dc56708c24 (diff) | |
| download | ffmpeg-36e2ec40688d0c3c350d31fae00a54f6a23b7647.tar.gz | |
Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'
* commit 'f7d228676cb7669059889c4225c8a8dc56708c24':
mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 80d08e601d..fb65481102 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1210,7 +1210,7 @@ static int mpeg4_decode_partitioned_mb(MpegEncContext *s, int16_t block[6][64]) mb_type = s->current_picture.mb_type[xy]; cbp = s->cbp_table[xy]; - ctx->use_intra_dc_vlc = s->qscale < s->intra_dc_threshold; + ctx->use_intra_dc_vlc = s->qscale < ctx->intra_dc_threshold; if (s->current_picture.qscale_table[xy] != s->qscale) ff_set_qscale(s, s->current_picture.qscale_table[xy]); @@ -1608,7 +1608,7 @@ intra: } cbp = (cbpc & 3) | (cbpy << 2); - ctx->use_intra_dc_vlc = s->qscale < s->intra_dc_threshold; + ctx->use_intra_dc_vlc = s->qscale < ctx->intra_dc_threshold; if (dquant) ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); @@ -2362,7 +2362,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) av_log(s->avctx, AV_LOG_ERROR, "Header truncated\n"); return -1; } - s->intra_dc_threshold = ff_mpeg4_dc_threshold[get_bits(gb, 3)]; + ctx->intra_dc_threshold = ff_mpeg4_dc_threshold[get_bits(gb, 3)]; if (!s->progressive_sequence) { s->top_field_first = get_bits1(gb); s->alternate_scan = get_bits1(gb); @@ -2434,7 +2434,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) s->data_partitioning, ctx->resync_marker, ctx->num_sprite_warping_points, s->sprite_warping_accuracy, 1 - s->no_rounding, s->vo_type, - s->vol_control_parameters ? " VOLC" : " ", s->intra_dc_threshold, + s->vol_control_parameters ? " VOLC" : " ", ctx->intra_dc_threshold, ctx->cplx_estimation_trash_i, ctx->cplx_estimation_trash_p, ctx->cplx_estimation_trash_b, s->time, |