aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-11-14 23:35:37 +0100
committerMax Kellermann <max@duempel.org>2009-11-14 23:35:37 +0100
commit141cbc60b919c0e4e8c03963ce49402b3f9dbec8 (patch)
treee3013c94f27bfd67d74031b3f20a6449fef9d63b
parent2c1fb48318436a7e7872acdf4ffd81817f7fab52 (diff)
downloadmpd-141cbc60b919c0e4e8c03963ce49402b3f9dbec8.tar.gz
mpd-141cbc60b919c0e4e8c03963ce49402b3f9dbec8.tar.xz
mpd-141cbc60b919c0e4e8c03963ce49402b3f9dbec8.zip
decoder/audio: eliminate the "bits" variable
Pass the audiofile_setup_sample_format() result to audio_format_init_checked().
-rw-r--r--src/decoder/audiofile_plugin.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/decoder/audiofile_plugin.c b/src/decoder/audiofile_plugin.c
index 4ef471f46..5a2096d00 100644
--- a/src/decoder/audiofile_plugin.c
+++ b/src/decoder/audiofile_plugin.c
@@ -127,7 +127,6 @@ audiofile_stream_decode(struct decoder *decoder, struct input_stream *is)
AFvirtualfile *vf;
int fs, frame_count;
AFfilehandle af_fp;
- int bits;
struct audio_format audio_format;
float total_time;
uint16_t bit_rate;
@@ -148,11 +147,9 @@ audiofile_stream_decode(struct decoder *decoder, struct input_stream *is)
return;
}
- bits = audiofile_setup_sample_format(af_fp);
-
if (!audio_format_init_checked(&audio_format,
afGetRate(af_fp, AF_DEFAULT_TRACK),
- bits,
+ audiofile_setup_sample_format(af_fp),
afGetVirtualChannels(af_fp, AF_DEFAULT_TRACK),
&error)) {
g_warning("%s", error->message);