aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-12 18:39:04 +0100
committerMax Kellermann <max@duempel.org>2009-02-12 18:39:04 +0100
commit5f84fe2717628fcd5689060ca7e4556ade577b4a (patch)
tree5764920a784acfe2a72454cf42289cba817bcc8c
parent7ddcc4c8a1927d6ca4361d132b56883c8ca77450 (diff)
downloadmpd-5f84fe2717628fcd5689060ca7e4556ade577b4a.tar.gz
mpd-5f84fe2717628fcd5689060ca7e4556ade577b4a.tar.xz
mpd-5f84fe2717628fcd5689060ca7e4556ade577b4a.zip
aac: fix stream metadata
Pass the input_stream object to decoder_data(). Without it, the MPD core does not see stream tags.
-rw-r--r--NEWS1
-rw-r--r--src/decoder/aac_plugin.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index f0118885e..d3ad7fe8f 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ ver 0.14.2 (2009/??/??)
- ffmpeg: added TTA support
- wavpack: pass NULL if the .wvc file fails to open
- mikmod: call MikMod_Exit() only in the finish() method
+ - aac: fix stream metadata
* audio outputs:
- jack: allocate ring buffers before connecting
- jack: clear "shutdown" flag on reconnect
diff --git a/src/decoder/aac_plugin.c b/src/decoder/aac_plugin.c
index 19a7d7c9c..0d2c2c356 100644
--- a/src/decoder/aac_plugin.c
+++ b/src/decoder/aac_plugin.c
@@ -430,7 +430,7 @@ aac_stream_decode(struct decoder *mpd_decoder, struct input_stream *inStream)
sampleBufferLen = sampleCount * 2;
- cmd = decoder_data(mpd_decoder, NULL, sampleBuffer,
+ cmd = decoder_data(mpd_decoder, inStream, sampleBuffer,
sampleBufferLen, file_time,
bitRate, NULL);
if (cmd == DECODE_COMMAND_SEEK)