fixed possible format_context not closed in ffmpeg_decode

f2250513 · geneticdrift · Max Kellermann · b2e3fdef · f2250513
Commit f2250513 authored Feb 07, 2014 by geneticdrift Committed by Max Kellermann Feb 07, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

FfmpegDecoderPlugin.cxx src/decoder/plugins/FfmpegDecoderPlugin.cxx +4 -1

No files found.
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -424,8 +424,11 @@ ffmpeg_decode(Decoder &decoder, InputStream &input)

 	const SampleFormat sample_format =
 		ffmpeg_sample_format(codec_context->sample_fmt);
-	if (sample_format == SampleFormat::UNDEFINED)
+	if (sample_format == SampleFormat::UNDEFINED) {
+		// (error message already done by ffmpeg_sample_format())
+		avformat_close_input(&format_context);
 		return;
+	}

 	Error error;
 	AudioFormat audio_format;