OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e643b32
)
added forgotten emms() - fix various segmentation faults when using mjpeg
author
Fabrice Bellard
<fabrice@bellard.org>
Wed, 8 Aug 2001 19:08:50 +0000
(19:08 +0000)
committer
Fabrice Bellard
<fabrice@bellard.org>
Wed, 8 Aug 2001 19:08:50 +0000
(19:08 +0000)
Originally committed as revision 57 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/mjpeg.c
patch
|
blob
|
history
diff --git
a/libavcodec/mjpeg.c
b/libavcodec/mjpeg.c
index
df7415b
..
97a9501
100644
(file)
--- a/
libavcodec/mjpeg.c
+++ b/
libavcodec/mjpeg.c
@@
-796,6
+796,7
@@
static int mjpeg_decode_sos(MJpegDecodeContext *s,
}
}
}
+ emms_c();
return 0;
}
@@
-874,6
+875,7
@@
static int mjpeg_decode_frame(AVCodecContext *avctx,
start_code = s->start_code;
s->buf_ptr = s->buffer;
s->start_code = code;
+ dprintf("marker=%x\n", start_code);
switch(start_code) {
case SOI:
/* nothing to do on SOI */