Commit aeead427 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '2992afda'

* commit '2992afda':
  mpeg4videodec: remove a write-only variable from MpegEncContext
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1897c4a1 2992afda
......@@ -2000,7 +2000,7 @@ no_cplx_est:
int v_sampling_factor_n;
int v_sampling_factor_m;
s->hierachy_type = get_bits1(gb);
skip_bits1(gb); // hierarchy_type
skip_bits(gb, 4); /* ref_layer_id */
skip_bits1(gb); /* ref_layer_sampling_dir */
h_sampling_factor_n = get_bits(gb, 5);
......
......@@ -606,7 +606,6 @@ typedef struct MpegEncContext {
int quant_precision;
int quarter_sample; ///< 1->qpel, 0->half pel ME/MC
int scalability;
int hierachy_type;
int enhancement_type;
int aspect_ratio_info; //FIXME remove
int sprite_warping_accuracy;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment