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:
3ee83f4
)
Revert "MJPEG: emulate EOI also on two consecutive SOI."
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 15 Sep 2011 01:03:33 +0000
(
03:03
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 15 Sep 2011 02:17:26 +0000
(
04:17
+0200)
This causes Ticket463, fix will be in the next commits
This reverts commit
5e2ea138b7c4c7f3910837611338bb3b8b761045
.
libavcodec/mjpegdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mjpegdec.c
b/libavcodec/mjpegdec.c
index
b2e063f
..
2c6330b
100644
(file)
--- a/
libavcodec/mjpegdec.c
+++ b/
libavcodec/mjpegdec.c
@@
-1447,10
+1447,6
@@
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);