]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
Add support for grayscale MJPEG streams sent by Axis cameras such as the
authordiego <diego@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 4 Aug 2007 20:49:39 +0000 (20:49 +0000)
committerdiego <diego@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 4 Aug 2007 20:49:39 +0000 (20:49 +0000)
207MW (http://www.axis.com/products/cam_207mw/).
patch by Sam Hocevar, sam+ffmpeg zoy org

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9913 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/mjpegdec.c

index aa8d2e4f60172c96617dee4f61cba08c76b42c24..fab30b044da8b06d7826e144955dc0d9336d4a52 100644 (file)
@@ -298,6 +298,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
         else
             s->avctx->pix_fmt = PIX_FMT_GRAY8;
         break;
+    case 0x110000:
+        s->avctx->pix_fmt = PIX_FMT_GRAY8;
+        break;
     case 0x121111:
         s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV440P : PIX_FMT_YUVJ440P;
         break;