diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-26 14:34:52 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-29 17:34:34 +0100 |
| commit | e89247debd5276d57ce4a26516224204f9541af0 (patch) | |
| tree | 7226326ea772efc55c481d5f5dba709f09f5339f | |
| parent | 8cebc9eaac8631adb23dd1e46c37ad8474139a07 (diff) | |
mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 0b229745f3..e2ad7941eb 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1946,13 +1946,11 @@ no_cplx_est: skip_bits(gb, 2); /* requested upstream message type */ skip_bits1(gb); /* newpred segment type */ } - s->reduced_res_vop = get_bits1(gb); - if (s->reduced_res_vop) + if (get_bits1(gb)) // reduced_res_vop av_log(s->avctx, AV_LOG_ERROR, "reduced resolution VOP not supported\n"); } else { s->new_pred = 0; - s->reduced_res_vop = 0; } s->scalability = get_bits1(gb); diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 8250211c4f..3d4e26d542 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -593,7 +593,6 @@ typedef struct MpegEncContext { int hierachy_type; int enhancement_type; int new_pred; - int reduced_res_vop; int aspect_ratio_info; //FIXME remove int sprite_warping_accuracy; int data_partitioning; ///< data partitioning flag from header |