Commit feed2018 authored by Daniel Kucera's avatar Daniel Kucera Committed by wm4

libavformat/wtvdec: return AVERROR_EOF on EOF

Signed-off-by: 's avatarDaniel Kucera <daniel.kucera@gmail.com>
Signed-off-by: 's avatarwm4 <nfxjfg@googlemail.com>
parent 6b52c0b5
...@@ -65,7 +65,7 @@ static int64_t seek_by_sector(AVIOContext *pb, int64_t sector, int64_t offset) ...@@ -65,7 +65,7 @@ static int64_t seek_by_sector(AVIOContext *pb, int64_t sector, int64_t offset)
} }
/** /**
* @return bytes read, 0 on end of file, or <0 on error * @return bytes read, AVERROR_EOF on end of file, or <0 on error
*/ */
static int wtvfile_read_packet(void *opaque, uint8_t *buf, int buf_size) static int wtvfile_read_packet(void *opaque, uint8_t *buf, int buf_size)
{ {
...@@ -76,7 +76,7 @@ static int wtvfile_read_packet(void *opaque, uint8_t *buf, int buf_size) ...@@ -76,7 +76,7 @@ static int wtvfile_read_packet(void *opaque, uint8_t *buf, int buf_size)
if (wf->error || pb->error) if (wf->error || pb->error)
return -1; return -1;
if (wf->position >= wf->length || avio_feof(pb)) if (wf->position >= wf->length || avio_feof(pb))
return 0; return AVERROR_EOF;
buf_size = FFMIN(buf_size, wf->length - wf->position); buf_size = FFMIN(buf_size, wf->length - wf->position);
while(nread < buf_size) { while(nread < buf_size) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment