[FFmpeg-cvslog] avformat/wtvdec: Forward errors when reading packet
Andreas Rheinhardt
git at videolan.org
Wed Feb 19 23:39:28 EET 2020
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Mon Feb 10 18:21:37 2020 +0100| [acbd950ed297fded711481a4059a83b085f888ae] | committer: Michael Niedermayer
avformat/wtvdec: Forward errors when reading packet
wtvfile_read_packet did not abide by the requirements of an
AVIOContext's read_packet-function: If it did not read anything,
it returned zero, which currently leads to a warning in read_packet_wrapper
in aviobuf.c. Said warning will be an av_assert2 as soon as
FF_API_OLD_AVIO_EOF_0 is zero (probably the next major version bump).
So instead forward the error code from the underlying protocol.
This error/assert is triggered in the wtv-demux FATE test.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
Reviewed-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=acbd950ed297fded711481a4059a83b085f888ae
---
libavformat/wtvdec.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index 67d934f074..83f510b92f 100644
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -71,7 +71,7 @@ static int wtvfile_read_packet(void *opaque, uint8_t *buf, int buf_size)
{
WtvFile *wf = opaque;
AVIOContext *pb = wf->pb_filesystem;
- int nread = 0;
+ int nread = 0, n = 0;
if (wf->error || pb->error)
return -1;
@@ -80,7 +80,6 @@ static int wtvfile_read_packet(void *opaque, uint8_t *buf, int buf_size)
buf_size = FFMIN(buf_size, wf->length - wf->position);
while(nread < buf_size) {
- int n;
int remaining_in_sector = (1 << wf->sector_bits) - (wf->position & ((1 << wf->sector_bits) - 1));
int read_request = FFMIN(buf_size - nread, remaining_in_sector);
@@ -100,7 +99,7 @@ static int wtvfile_read_packet(void *opaque, uint8_t *buf, int buf_size)
}
}
}
- return nread;
+ return nread ? nread : n;
}
/**
More information about the ffmpeg-cvslog
mailing list