virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Merge commit 'd4df02131b5522a99a4e6035368484e809706ed5'

Browse Source 
* commit 'd4df02131b5522a99a4e6035368484e809706ed5':
  ac3dec: Remove write-only channel_layout field from AC3DecodeContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-23 13:45:04 +01:00
commit 94194bdcd7
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/ac3dec.c
View File

@ -261,7 +261,6 @@ static int parse_frame_header(AC3DecodeContext *s)
s->bit_alloc_params.sr_code = hdr.sr_code; s->bit_alloc_params.sr_code = hdr.sr_code;
s->bitstream_mode = hdr.bitstream_mode; s->bitstream_mode = hdr.bitstream_mode;
s->channel_mode = hdr.channel_mode; s->channel_mode = hdr.channel_mode;
s->channel_layout = hdr.channel_layout;
s->lfe_on = hdr.lfe_on; s->lfe_on = hdr.lfe_on;
s->bit_alloc_params.sr_shift = hdr.sr_shift; s->bit_alloc_params.sr_shift = hdr.sr_shift;
s->sample_rate = hdr.sample_rate; s->sample_rate = hdr.sample_rate;

1
libavcodec/ac3dec.h
View File

@ -81,7 +81,6 @@ typedef struct AC3DecodeContext {
int num_blocks; ///< number of audio blocks int num_blocks; ///< number of audio blocks
int bitstream_mode; ///< bitstream mode (bsmod) int bitstream_mode; ///< bitstream mode (bsmod)
int channel_mode; ///< channel mode (acmod) int channel_mode; ///< channel mode (acmod)
int channel_layout; ///< channel layout
int lfe_on; ///< lfe channel in use int lfe_on; ///< lfe channel in use
int channel_map; ///< custom channel map int channel_map; ///< custom channel map
int center_mix_level; ///< Center mix level index int center_mix_level; ///< Center mix level index