[FFmpeg-cvslog] avformat/aviobuf: check if read_packet() exist before read_packet_wrapper()
Limin Wang
git at videolan.org
Sat Dec 4 03:28:20 EET 2021
ffmpeg | branch: master | Limin Wang <lance.lmwang at gmail.com> | Fri Dec 3 12:07:34 2021 +0800| [3c74ffb01ac3aa567d166362237117a6ca7c0775] | committer: Limin Wang
avformat/aviobuf: check if read_packet() exist before read_packet_wrapper()
without it, read_packet_wrapper() will return AVERROR(EINVAL) and avio_read
will be failed.
Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c74ffb01ac3aa567d166362237117a6ca7c0775
---
libavformat/aviobuf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 5da4dea7b6..14688a2262 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -646,7 +646,7 @@ int avio_read(AVIOContext *s, unsigned char *buf, int size)
while (size > 0) {
len = FFMIN(s->buf_end - s->buf_ptr, size);
if (len == 0 || s->write_flag) {
- if((s->direct || size > s->buffer_size) && !s->update_checksum) {
+ if((s->direct || size > s->buffer_size) && !s->update_checksum && s->read_packet) {
// bypass the buffer and read data directly into buf
len = read_packet_wrapper(s, buf, size);
if (len == AVERROR_EOF) {
More information about the ffmpeg-cvslog
mailing list