aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorTim Walker <tdskywalker@gmail.com>2013-11-22 17:25:49 +0100
committerDiego Biurrun <diego@biurrun.de>2013-11-22 23:27:34 +0100
commitd4df02131b5522a99a4e6035368484e809706ed5 (patch)
treefbb9e66e0d06e16d2b5d4e861a6a4282bf70e64d /libavcodec
parentb53285462263ef8a795f0e289abd5799b4c57652 (diff)
downloadffmpeg-d4df02131b5522a99a4e6035368484e809706ed5.tar.gz
ac3dec: Remove write-only channel_layout field from AC3DecodeContext
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ac3dec.c1
-rw-r--r--libavcodec/ac3dec.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 9086a2a5dd..e9ed04045f 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -261,7 +261,6 @@ static int parse_frame_header(AC3DecodeContext *s)
s->bit_alloc_params.sr_code = hdr.sr_code;
s->bitstream_mode = hdr.bitstream_mode;
s->channel_mode = hdr.channel_mode;
- s->channel_layout = hdr.channel_layout;
s->lfe_on = hdr.lfe_on;
s->bit_alloc_params.sr_shift = hdr.sr_shift;
s->sample_rate = hdr.sample_rate;
diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h
index 06b8544c82..7b4a528f75 100644
--- a/libavcodec/ac3dec.h
+++ b/libavcodec/ac3dec.h
@@ -81,7 +81,6 @@ typedef struct AC3DecodeContext {
int num_blocks; ///< number of audio blocks
int bitstream_mode; ///< bitstream mode (bsmod)
int channel_mode; ///< channel mode (acmod)
- int channel_layout; ///< channel layout
int lfe_on; ///< lfe channel in use
int channel_map; ///< custom channel map
int center_mix_level; ///< Center mix level index