diff options
| author | Max Kellermann <max@duempel.org> | 2009-07-19 18:18:32 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-07-19 18:18:32 +0200 |
| commit | c9d43b4d713d508b6f5b67cfffba9296f9436934 (patch) | |
| tree | 70100c28e365a244f5c6a361d2ecda332df2a756 /src/decoder/faad_plugin.c | |
| parent | c5ec035fb4a533ebd9f8c69b085604560d2a5487 (diff) | |
| parent | 49ede85827c095d0a6ead0ecb63e83e000a76d4f (diff) | |
| download | mpd-c9d43b4d713d508b6f5b67cfffba9296f9436934.tar.gz mpd-c9d43b4d713d508b6f5b67cfffba9296f9436934.tar.xz mpd-c9d43b4d713d508b6f5b67cfffba9296f9436934.zip | |
Merge branch 'master' of git://git.infradead.org/users/dwmw2/mpd
Conflicts:
Makefile.am
Diffstat (limited to 'src/decoder/faad_plugin.c')
| -rw-r--r-- | src/decoder/faad_plugin.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/decoder/faad_plugin.c b/src/decoder/faad_plugin.c index d0537dd5b..1b8b2b784 100644 --- a/src/decoder/faad_plugin.c +++ b/src/decoder/faad_plugin.c @@ -262,11 +262,7 @@ faad_decoder_init(faacDecHandle decoder, struct decoder_buffer *buffer, decoder_buffer_consume(buffer, nbytes); - *audio_format = (struct audio_format){ - .bits = 16, - .channels = channels, - .sample_rate = sample_rate, - }; + audio_format_init(audio_format, sample_rate, 16, channels); return true; } |