1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00

Merge commit 'e89247debd5276d57ce4a26516224204f9541af0'

* commit 'e89247debd5276d57ce4a26516224204f9541af0':
  mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-30 03:46:49 +01:00
commit 47e5eaf8c9
2 changed files with 1 additions and 4 deletions

View File

@ -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);

View File

@ -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