X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.cc;h=39abfe2b84ce71679cd66af9ac20a7d59a34d199;hb=975909a62d4cb37c73492abfdd610fa7d1b06935;hp=6ec368ef64f49b7fabf3788ac95a8f655ebdfd34;hpb=c2f74bf15f6f2a88138119a42a44f4241169f6e5;p=dcpomatic.git

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 6ec368ef6..39abfe2b8 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -273,7 +273,11 @@ FFmpeg::subtitle_codec_context () const
 int
 FFmpeg::avio_read (uint8_t* buffer, int const amount)
 {
-	return _file_group.read (buffer, amount);
+	auto result = _file_group.read(buffer, amount);
+	if (result.eof && result.bytes_read == 0) {
+		return AVERROR_EOF;
+	}
+	return result.bytes_read;
 }