OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5781c98
)
avformat/flic: fix handling of EOF case
author
Paul B Mahol
<onemda@gmail.com>
Sat, 11 Feb 2017 19:07:39 +0000
(20:07 +0100)
committer
Paul B Mahol
<onemda@gmail.com>
Sat, 11 Feb 2017 19:20:07 +0000
(20:20 +0100)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavformat/flic.c
patch
|
blob
|
history
diff --git
a/libavformat/flic.c
b/libavformat/flic.c
index
49f5d21
..
7c62cb4
100644
(file)
--- 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 = {