diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index 9b2aa35..7adf022 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -134,8 +134,15 @@ AVInputFormat ff_latm_demuxer = {
 };
 #endif
 
+static int mjpeg_probe(AVProbeData *p)
+{
+    if (AV_RB16(p->buf) == 0xffd8)
+        return AVPROBE_SCORE_EXTENSION / 2;
+    return 0;
+}
+
 #if CONFIG_MJPEG_DEMUXER
-FF_DEF_RAWVIDEO_DEMUXER(mjpeg, "raw MJPEG video", NULL, "mjpg,mjpeg,mpo", AV_CODEC_ID_MJPEG)
+FF_DEF_RAWVIDEO_DEMUXER(mjpeg, "raw MJPEG video", mjpeg_probe, "mjpg,mjpeg,mpo", AV_CODEC_ID_MJPEG)
 #endif
 
 #if CONFIG_MLP_DEMUXER