diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 13:45:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 13:45:09 +0100 |
| commit | 94194bdcd7bfc2137ccd13e5c149567b9a917f4f (patch) | |
| tree | 8afe7b8e9e0d6243389f878f192aa113a4893124 | |
| parent | 2cbf27b08a4991de608b305a8600b59467587605 (diff) | |
| parent | d4df02131b5522a99a4e6035368484e809706ed5 (diff) | |
| download | ffmpeg-94194bdcd7bfc2137ccd13e5c149567b9a917f4f.tar.gz | |
Merge commit 'd4df02131b5522a99a4e6035368484e809706ed5'
* commit 'd4df02131b5522a99a4e6035368484e809706ed5':
ac3dec: Remove write-only channel_layout field from AC3DecodeContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ac3dec.c | 1 | ||||
| -rw-r--r-- | libavcodec/ac3dec.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index fd85806bda..44b5f444c8 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 ae72d80c83..fa447c4d6f 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 |