summaryrefslogtreecommitdiff
path: root/libavformat/jvdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-20 23:49:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-20 23:50:58 +0100
commitd2344afb90db38c8e0367b05540f21c4fb2e91a1 (patch)
treee15ea7d45084213ae8e3be89413b49ac5acada98 /libavformat/jvdec.c
parentce612fc1863830f1b5255beb42e244138f78e145 (diff)
parent027712e851da4d124a842c9e2802f95d50582553 (diff)
Merge commit '027712e851da4d124a842c9e2802f95d50582553'
* commit '027712e851da4d124a842c9e2802f95d50582553': jvdec: Return EOF on end of file Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/jvdec.c')
-rw-r--r--libavformat/jvdec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/jvdec.c b/libavformat/jvdec.c
index 69ac8f27fd..60c1bd9222 100644
--- a/libavformat/jvdec.c
+++ b/libavformat/jvdec.c
@@ -184,6 +184,9 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
}
}
+ if (s->pb->eof_reached)
+ return AVERROR_EOF;
+
return AVERROR(EIO);
}