From 2992afda83a7d5c0a9ec45bdce76d8abbe0961c5 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Tue, 26 Nov 2013 14:45:14 +0100
Subject: [PATCH] mpeg4videodec: remove a write-only variable from
MpegEncContext
---
libavcodec/mpeg4videodec.c | 2 +-
libavcodec/mpegvideo.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index b1bcd38e071..32ffbb87007 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -1962,7 +1962,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 8dbded98dfe..97a3a725626 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -590,7 +590,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;
--
GitLab