summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorDaniel Kucera <daniel.kucera@gmail.com>2017-10-23 15:29:17 +0200
committerwm4 <wm4@nowhere>2017-10-30 12:42:00 +0100
commite9dc4ac86f9dbd59147963d08ec8447bba3ed0bb (patch)
tree2746e7edb7513b3fd31e5051e2be02aa99da3843 /demux
parent6b745769b1fd15ba03edad3fe381abb745bf9907 (diff)
downloadmpv-e9dc4ac86f9dbd59147963d08ec8447bba3ed0bb.tar.bz2
mpv-e9dc4ac86f9dbd59147963d08ec8447bba3ed0bb.tar.xz
demux_lavf: return AVERROR_EOF on file end
Signed-off-by: Daniel Kucera <daniel.kucera@gmail.com> Signed-off-by: wm4 <wm4@nowhere> Uses different style and different logic from original PR.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_lavf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index c11f7739e1..11fa1c59b6 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -242,7 +242,7 @@ static int mp_read(void *opaque, uint8_t *buf, int size)
MP_TRACE(demuxer, "%d=mp_read(%p, %p, %d), pos: %"PRId64", eof:%d\n",
ret, stream, buf, size, stream_tell(stream), stream->eof);
- return ret;
+ return ret ? ret : AVERROR_EOF;
}
static int64_t mp_seek(void *opaque, int64_t pos, int whence)