Merge tag 'v0.23.6'

release v0.23.6
2022-03-14 18:58:47 +01:00
parent 7293b32025 f591193dda
commit 407fa2720a
11 changed files with 114 additions and 49 deletions
--- a/src/decoder/plugins/FfmpegIo.cxx
+++ b/src/decoder/plugins/FfmpegIo.cxx
@@ -21,6 +21,7 @@
 #define __STDC_CONSTANT_MACROS

 #include "FfmpegIo.hxx"
+#include "libavutil/mem.h"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"

@@ -35,7 +36,11 @@ AvioStream::~AvioStream()
 inline int
 AvioStream::Read(void *dest, int size)
 {
-	return decoder_read(client, input, dest, size);
+	const auto nbytes = decoder_read(client, input, dest, size);
+	if (nbytes == 0)
+		return AVERROR_EOF;
+
+	return nbytes;
 }

 inline int64_t