summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2001-08-08 19:08:50 +0000
committerFabrice Bellard <fabrice@bellard.org>2001-08-08 19:08:50 +0000
commit186f8ae1f567d4a74b2ffb5d54a012dcb1c4c89f (patch)
treea656f35559514c9906b6e096506ca2ed9ebb1036 /libavcodec
parente643b32b1b37f6ad1b7bfc408eddcab74b077c5f (diff)
added forgotten emms() - fix various segmentation faults when using mjpeg
Originally committed as revision 57 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mjpeg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index df7415b812..97a9501f06 100644
--- 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 */