Merge branch 'v0.18.x'

2014-01-08 22:14:12 +01:00
parent 959d7ca9d0 fdd76b3461
commit 139122c57f
6 changed files with 12 additions and 3 deletions
--- a/src/decoder/FaadDecoderPlugin.cxx
+++ b/src/decoder/FaadDecoderPlugin.cxx
@@ -359,6 +359,7 @@ faad_stream_decode(Decoder &mpd_decoder, InputStream &is)
 	if (!faad_decoder_init(decoder, buffer, audio_format, error)) {
 		LogError(error);
 		NeAACDecClose(decoder);
+		decoder_buffer_free(buffer);
 		return;
 	}

@@ -428,6 +429,7 @@ faad_stream_decode(Decoder &mpd_decoder, InputStream &is)
 	/* cleanup */

 	NeAACDecClose(decoder);
+	decoder_buffer_free(buffer);
 }

 static bool