From: Michael Niedermayer Date: Sat, 30 Nov 2013 03:34:43 +0000 (+0100) Subject: Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58' X-Git-Tag: android-x86-6.0-r1~8626 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7f18cb9101e4e1921fd0a5cfe72fbdb69ac9bf8a;p=android-x86%2Fexternal-ffmpeg.git Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58' * commit '513d849bb605d3d862da1ada709bd2ca1ac68f58': mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer --- 7f18cb9101e4e1921fd0a5cfe72fbdb69ac9bf8a diff --cc libavcodec/mpeg4videodec.c index 5ccd18a13b,f8bb54c4c8..befb91d110 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@@ -2425,13 -2236,13 +2425,13 @@@ static int decode_vop_header(Mpeg4DecCo if (s->avctx->debug & FF_DEBUG_PICT_INFO) { av_log(s->avctx, AV_LOG_DEBUG, - "qp:%d fc:%d,%d %s size:%d pro:%d alt:%d top:%d %spel part:%d resync:%d w:%d a:%d rnd:%d vot:%d%s dc:%d ce:%d/%d/%d\n", + "qp:%d fc:%d,%d %s size:%d pro:%d alt:%d top:%d %spel part:%d resync:%d w:%d a:%d rnd:%d vot:%d%s dc:%d ce:%d/%d/%d time:%"PRId64" tincr:%d\n", s->qscale, s->f_code, s->b_code, s->pict_type == AV_PICTURE_TYPE_I ? "I" : (s->pict_type == AV_PICTURE_TYPE_P ? "P" : (s->pict_type == AV_PICTURE_TYPE_B ? "B" : "S")), - gb->size_in_bits, s->progressive_sequence, s->alternate_scan, + gb->size_in_bits,s->progressive_sequence, s->alternate_scan, s->top_field_first, s->quarter_sample ? "q" : "h", s->data_partitioning, ctx->resync_marker, - s->num_sprite_warping_points, s->sprite_warping_accuracy, + 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, ctx->cplx_estimation_trash_i, ctx->cplx_estimation_trash_p,