diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:21:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:23:43 +0100 |
| commit | ae4e7f7ba603a1624d4aaeee2c368677739b7322 (patch) | |
| tree | 29ea5c72f1e2be65b88f16a5974d7e50851cb594 | |
| parent | b27ba2e540b873fe8e50280a734194ada002a077 (diff) | |
| parent | 58c120a9290eef057dbf26761a4f89b7f67bbde1 (diff) | |
| download | ffmpeg-ae4e7f7ba603a1624d4aaeee2c368677739b7322.tar.gz | |
Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'
* commit '58c120a9290eef057dbf26761a4f89b7f67bbde1':
mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpeg4video.h | 1 | ||||
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 10 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index 15fe68fc2c..d8751f7615 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -75,6 +75,7 @@ typedef struct Mpeg4DecContext { int new_pred; int enhancement_type; + int scalability; /* bug workarounds */ int divx_version; diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 8a934b5b2c..bda8c5e820 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1991,9 +1991,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; @@ -2013,7 +2013,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"); @@ -2028,7 +2028,7 @@ no_cplx_est: ctx->time_increment_bits, s->quant_precision, s->progressive_sequence, - s->scalability ? "scalability " :"" , s->quarter_sample ? "qpel " : "", + ctx->scalability ? "scalability " :"" , s->quarter_sample ? "qpel " : "", s->data_partitioning ? "partition " : "", ctx->rvlc ? "rvlc " : "" ); } @@ -2441,7 +2441,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) ); } - 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 { diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 9225bebb6b..acc047c3fd 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -605,7 +605,6 @@ typedef struct MpegEncContext { int mcsel; int quant_precision; int quarter_sample; ///< 1->qpel, 0->half pel ME/MC - int scalability; int aspect_ratio_info; //FIXME remove int sprite_warping_accuracy; int data_partitioning; ///< data partitioning flag from header |