diff options
| author | Sam Hocevar <sam+ffmpeg@zoy.org> | 2007-08-04 20:49:39 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-08-04 20:49:39 +0000 |
| commit | 97be28d8d717fd7bbe5a5064b5efd24dfb9d73a2 (patch) | |
| tree | a7d02c35cc76fcc0d686e2fac5f10bba5b3d3248 | |
| parent | d2f8f410bc3fb4e3b590f2c1db21f1982d734658 (diff) | |
| download | ffmpeg-97be28d8d717fd7bbe5a5064b5efd24dfb9d73a2.tar.gz | |
Add support for grayscale MJPEG streams sent by Axis cameras such as the
207MW (http://www.axis.com/products/cam_207mw/).
patch by Sam Hocevar, sam+ffmpeg zoy org
Originally committed as revision 9913 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mjpegdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index aa8d2e4f60..fab30b044d 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -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; |