summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-10-01 20:11:40 +0200
committerCarl Hetherington <cth@carlh.net>2022-10-04 23:20:11 +0200
commitf583e13fe48e8b6cf4f3f9195fd31b603bc41fc2 (patch)
tree23ef83b7c40892230455d2a5c5e8d4ea1bad4dd6 /src/lib/ffmpeg.cc
parentbe486380a15a9e444c761384cd6c60e77def909f (diff)
Return AVERROR_EOF from the avio_read method when appropriate.
Diffstat (limited to 'src/lib/ffmpeg.cc')
-rw-r--r--src/lib/ffmpeg.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 6c8509b6c..8220962d6 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;
}