generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'

Browse Source 
* commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5':
  mpeg4videodec: remove a write-only variable from MpegEncContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-30 04:02:11 +01:00
commit aeead42789
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpeg4videodec.c
View File

@ -2000,7 +2000,7 @@ no_cplx_est:
int v_sampling_factor_n; int v_sampling_factor_n;
int v_sampling_factor_m; int v_sampling_factor_m;
s->hierachy_type = get_bits1(gb); skip_bits1(gb); // hierarchy_type
skip_bits(gb, 4); /* ref_layer_id */ skip_bits(gb, 4); /* ref_layer_id */
skip_bits1(gb); /* ref_layer_sampling_dir */ skip_bits1(gb); /* ref_layer_sampling_dir */
h_sampling_factor_n = get_bits(gb, 5); h_sampling_factor_n = get_bits(gb, 5);

1
libavcodec/mpegvideo.h
View File

@ -606,7 +606,6 @@ typedef struct MpegEncContext {
int quant_precision; int quant_precision;
int quarter_sample; ///< 1->qpel, 0->half pel ME/MC int quarter_sample; ///< 1->qpel, 0->half pel ME/MC
int scalability; int scalability;
int hierachy_type;
int enhancement_type; int enhancement_type;
int aspect_ratio_info; //FIXME remove int aspect_ratio_info; //FIXME remove
int sprite_warping_accuracy; int sprite_warping_accuracy;