summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-05-03 12:48:43 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-05-03 12:48:43 +0200
commitc33d5a56d01e53398b84276f8ebef32f7cd965c3 (patch)
treef489342c0c6e2c455af90d2bb60e931514859ee2 /src
parent91a78bb5b21f6fabaa4b87fa798844ca1d88195d (diff)
downloadxine-lib-c33d5a56d01e53398b84276f8ebef32f7cd965c3.tar.gz
xine-lib-c33d5a56d01e53398b84276f8ebef32f7cd965c3.tar.bz2
ao_cap_mode is only ever used in faad_open_output, make it a local variable.
Diffstat (limited to 'src')
-rw-r--r--src/libfaad/xine_faad_decoder.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libfaad/xine_faad_decoder.c b/src/libfaad/xine_faad_decoder.c
index aa528a34d..169874a44 100644
--- a/src/libfaad/xine_faad_decoder.c
+++ b/src/libfaad/xine_faad_decoder.c
@@ -75,7 +75,6 @@ typedef struct faad_decoder_s {
int bits_per_sample;
unsigned char num_channels;
int sbr;
- uint32_t ao_cap_mode;
int output_open;
@@ -177,16 +176,18 @@ static int faad_open_dec( faad_decoder_t *this ) {
}
static int faad_open_output( faad_decoder_t *this ) {
+ int ao_cap_mode;
+
this->rec_audio_src_size = this->num_channels * FAAD_MIN_STREAMSIZE;
switch( this->num_channels ) {
case 1:
- this->ao_cap_mode=AO_CAP_MODE_MONO;
+ ao_cap_mode=AO_CAP_MODE_MONO;
break;
case 6:
if(this->stream->audio_out->get_capabilities(this->stream->audio_out) &
AO_CAP_MODE_5_1CHANNEL) {
- this->ao_cap_mode = AO_CAP_MODE_5_1CHANNEL;
+ ao_cap_mode = AO_CAP_MODE_5_1CHANNEL;
break;
} else {
this->faac_cfg = NeAACDecGetCurrentConfiguration(this->faac_dec);
@@ -195,7 +196,7 @@ static int faad_open_output( faad_decoder_t *this ) {
this->num_channels = 2;
}
case 2:
- this->ao_cap_mode=AO_CAP_MODE_STEREO;
+ ao_cap_mode=AO_CAP_MODE_STEREO;
break;
}
@@ -203,7 +204,7 @@ static int faad_open_output( faad_decoder_t *this ) {
this->stream,
this->bits_per_sample,
this->rate,
- this->ao_cap_mode) ;
+ ao_cap_mode) ;
return this->output_open;
}