highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dv: Don't return EIO upon EOF

Browse Source
This commit is contained in:
John Stebbins
2017-01-11 12:17:06 -07:00
parent 7cb9296db8
commit 42cf7f91f1
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/dv.c
View File

@@ -484,11 +484,14 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt)
size = avpriv_dv_get_packet(c->dv_demux, pkt); size = avpriv_dv_get_packet(c->dv_demux, pkt);
if (size < 0) { if (size < 0) {
int ret;
if (!c->dv_demux->sys) if (!c->dv_demux->sys)
return AVERROR(EIO); return AVERROR(EIO);
size = c->dv_demux->sys->frame_size; size = c->dv_demux->sys->frame_size;
if (avio_read(s->pb, c->buf, size) <= 0) ret = avio_read(s->pb, c->buf, size);
return AVERROR(EIO); if (ret <= 0)
return ret;
size = avpriv_dv_produce_packet(c->dv_demux, pkt, c->buf, size); size = avpriv_dv_produce_packet(c->dv_demux, pkt, c->buf, size);
} }