diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 03:46:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 03:46:53 +0100 |
| commit | 47e5eaf8c9869e8e34e96252b8eeaabec7bcc894 (patch) | |
| tree | f76f69f271c743211df4eb75a6a4f41f3d6aed10 /libavcodec | |
| parent | f4c28aea38aeda38d233c57fa6e0a2f52e1f5416 (diff) | |
| parent | e89247debd5276d57ce4a26516224204f9541af0 (diff) | |
Merge commit 'e89247debd5276d57ce4a26516224204f9541af0'
* commit 'e89247debd5276d57ce4a26516224204f9541af0':
mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 12101522d9..7d977e1f7a 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1984,13 +1984,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 0b03252cea..c16da96d5f 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -609,7 +609,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 |