diff --git a/libavcodec/i386/mpegvideo_mmx_template.c b/libavcodec/i386/mpegvideo_mmx_template.c
index ffe5c848af..2b33229159 100644
--- a/libavcodec/i386/mpegvideo_mmx_template.c
+++ b/libavcodec/i386/mpegvideo_mmx_template.c
@@ -48,6 +48,10 @@ static int RENAME(dct_quantize)(MpegEncContext *s,
 	/* mpeg1 */
         minLevel= -255;
 	maxLevel= 255;
+    }else if(s->out_format==FMT_MJPEG){
+	/* (m)jpeg */
+        minLevel= -1023;
+	maxLevel= 1023;
     }else{
 	/* h263 / msmpeg4 */
         minLevel= -128;
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index f43588cf45..72b8058a22 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1079,6 +1079,10 @@ static int dct_quantize_c(MpegEncContext *s,
 	/* mpeg1 */
         minLevel= -255;
 	maxLevel= 255;
+    }else if(s->out_format==FMT_MJPEG){
+	/* (m)jpeg */
+        minLevel= -1023;
+	maxLevel= 1023;
     }else{
 	/* h263 / msmpeg4 */
         minLevel= -128;