From 25d9cb462132e71143a2b87e80c2b02a0441fcf3 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Sat, 11 Feb 2017 20:07:39 +0100
Subject: [PATCH] avformat/flic: fix handling of EOF case
Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
libavformat/flic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/flic.c b/libavformat/flic.c
index 49f5d21f989..7c62cb423c8 100644
--- a/libavformat/flic.c
+++ b/libavformat/flic.c
@@ -204,7 +204,7 @@ static int flic_read_packet(AVFormatContext *s,
int ret = 0;
unsigned char preamble[FLIC_PREAMBLE_SIZE];
- while (!packet_read) {
+ while (!packet_read && !avio_feof(pb)) {
if ((ret = avio_read(pb, preamble, FLIC_PREAMBLE_SIZE)) !=
FLIC_PREAMBLE_SIZE) {
@@ -256,7 +256,7 @@ static int flic_read_packet(AVFormatContext *s,
}
}
- return ret;
+ return avio_feof(pb) ? AVERROR_EOF : ret;
}
AVInputFormat ff_flic_demuxer = {
--
GitLab