$ git diff
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 86ec58713c..f9131ea45a 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -313,6 +313,10 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
     len     = get_bits(&s->gb, 16);
     bits    = get_bits(&s->gb, 8);

+// FIXME hack to force bayer, don't yet know how / where I'm
+// supposed to set this before getting here.
+    s->bayer = 1;
+
     if (bits > 16 || bits < 1) {
         av_log(s->avctx, AV_LOG_ERROR, "bits %d is invalid\n", bits);
         return AVERROR_INVALIDDATA;
diff --git a/libavformat/mlvdec.c b/libavformat/mlvdec.c
index 1a6d38f37c..2eb21a3aab 100644
--- a/libavformat/mlvdec.c
+++ b/libavformat/mlvdec.c
@@ -44,8 +44,9 @@

 #define MLV_AUDIO_CLASS_WAV  1

-#define MLV_CLASS_FLAG_DELTA 0x40
 #define MLV_CLASS_FLAG_LZMA  0x80
+#define MLV_CLASS_FLAG_DELTA 0x40
+#define MLV_CLASS_FLAG_LJ92  0x20

 typedef struct {
     AVIOContext *pb[101];
@@ -298,9 +299,12 @@ static int read_header(AVFormatContext *avctx)
         if ((mlv->class[0] & (MLV_CLASS_FLAG_DELTA|MLV_CLASS_FLAG_LZMA)))
             avpriv_request_sample(avctx, "compression");
         vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
-        switch (mlv->class[0] & ~(MLV_CLASS_FLAG_DELTA|MLV_CLASS_FLAG_LZMA)) {
+        switch (mlv->class[0] & ~(MLV_CLASS_FLAG_DELTA|MLV_CLASS_FLAG_LZMA|MLV_CLASS_FLAG_LJ92)) {
         case MLV_VIDEO_CLASS_RAW:
-            vst->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO;
+            if (mlv->class[0] & MLV_CLASS_FLAG_LJ92)
+                vst->codecpar->codec_id = AV_CODEC_ID_MJPEG;
+            else
+                vst->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO;
             break;
         case MLV_VIDEO_CLASS_YUV:
             vst->codecpar->format   = AV_PIX_FMT_YUV420P;