[SCM] libav/experimental: added forgotten emms() - fix various segmentation faults when using mjpeg
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:29:49 UTC 2013
The following commit has been merged in the experimental branch:
commit 186f8ae1f567d4a74b2ffb5d54a012dcb1c4c89f
Author: Fabrice Bellard <fabrice at bellard.org>
Date: Wed Aug 8 19:08:50 2001 +0000
added forgotten emms() - fix various segmentation faults when using mjpeg
Originally committed as revision 57 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index df7415b..97a9501 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 */
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list