OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
55a1fe7
)
MJPEG: emulate EOI also on two consecutive SOI.
author
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Sat, 27 Aug 2011 12:37:14 +0000
(14:37 +0200)
committer
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Thu, 1 Sep 2011 20:54:35 +0000
(22:54 +0200)
Fixes issue #362.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
libavcodec/mjpegdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mjpegdec.c
b/libavcodec/mjpegdec.c
index
da0c5a9
..
eac30e6
100644
(file)
--- a/
libavcodec/mjpegdec.c
+++ b/
libavcodec/mjpegdec.c
@@
-1442,6
+1442,10
@@
int ff_mjpeg_decode_frame(AVCodecContext *avctx,
s->restart_count = 0;
/* nothing to do on SOI */
+ if (s->got_picture) {
+ av_log(avctx, AV_LOG_WARNING, "EOI missing, emulating\n");
+ goto eoi_parser;
+ }
break;
case DQT:
ff_mjpeg_decode_dqt(s);