summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4videodec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-30 04:02:11 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-30 04:02:14 +0100
commitaeead427896a632c09c13c2b90ba096bf8678ef1 (patch)
treeb8d010cb1fd07f6af2206309d025234fa7737638 /libavcodec/mpeg4videodec.c
parent1897c4a119d26a4f4781383497c2ab646cf60fe7 (diff)
parent2992afda83a7d5c0a9ec45bdce76d8abbe0961c5 (diff)
downloadffmpeg-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/mpeg4videodec.c')
-rw-r--r--libavcodec/mpeg4videodec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index ee48cb619b..aa8b9de297 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);