From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 2 Aug 2009 15:44:45 +0000 (+0100)
Subject: Patch from Ross Younger to correct FLAC decoding.
X-Git-Tag: 5.0~98
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/05af10e912eda8f299ea10927e75508c5fcdc3a9

Patch from Ross Younger to correct FLAC decoding.
---

diff --git a/server/decode.c b/server/decode.c
index ef999b3..0ced153 100644
--- a/server/decode.c
+++ b/server/decode.c
@@ -387,13 +387,20 @@ static void decode_flac(void) {
     fatal(0, "FLAC__file_decoder_init: %s", FLAC__FileDecoderStateString[fs]);
   FLAC__file_decoder_process_until_end_of_file(fd);
 #else
-  FLAC__StreamDecoder *sd = 0;
+  FLAC__StreamDecoder *sd = FLAC__stream_decoder_new();
   FLAC__StreamDecoderInitStatus is;
 
+  if (!sd)
+	fatal(0, "FLAC__stream_decoder_new failed");
+
   if((is = FLAC__stream_decoder_init_file(sd, path, flac_write, flac_metadata,
                                           flac_error, 0)))
     fatal(0, "FLAC__stream_decoder_init_file %s: %s",
           path, FLAC__StreamDecoderInitStatusString[is]);
+
+  FLAC__stream_decoder_process_until_end_of_stream(sd);
+  FLAC__stream_decoder_finish(sd);
+  FLAC__stream_decoder_delete(sd);
 #endif
 }