From 58c120a9290eef057dbf26761a4f89b7f67bbde1 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 26 Nov 2013 14:34:52 +0100 Subject: mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext --- libavcodec/mpeg4videodec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavcodec/mpeg4videodec.c') diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 114d24598f..2e320cd968 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1953,9 +1953,9 @@ no_cplx_est: ctx->new_pred = 0; } - s->scalability = get_bits1(gb); + ctx->scalability = get_bits1(gb); - if (s->scalability) { + if (ctx->scalability) { GetBitContext bak = *gb; int h_sampling_factor_n; int h_sampling_factor_m; @@ -1975,7 +1975,7 @@ no_cplx_est: v_sampling_factor_n == 0 || v_sampling_factor_m == 0) { /* illegal scalability header (VERY broken encoder), * trying to workaround */ - s->scalability = 0; + ctx->scalability = 0; *gb = bak; } else av_log(s->avctx, AV_LOG_ERROR, "scalability not supported\n"); @@ -2249,7 +2249,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) ctx->cplx_estimation_trash_b); } - if (!s->scalability) { + if (!ctx->scalability) { if (ctx->shape != RECT_SHAPE && s->pict_type != AV_PICTURE_TYPE_I) skip_bits1(gb); // vop shape coding type } else { -- cgit v1.2.3