diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:02:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:02:14 +0100 |
| commit | aeead427896a632c09c13c2b90ba096bf8678ef1 (patch) | |
| tree | b8d010cb1fd07f6af2206309d025234fa7737638 /libavcodec | |
| parent | 1897c4a119d26a4f4781383497c2ab646cf60fe7 (diff) | |
| parent | 2992afda83a7d5c0a9ec45bdce76d8abbe0961c5 (diff) | |
| download | ffmpeg-streaming-aeead427896a632c09c13c2b90ba096bf8678ef1.zip ffmpeg-streaming-aeead427896a632c09c13c2b90ba096bf8678ef1.tar.gz | |
Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'
* commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5':
mpeg4videodec: remove a write-only variable from MpegEncContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index ee48cb6..aa8b9de 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -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); diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 4d7ed72..9bec105 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -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; |
