OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d2f8f41
)
Add support for grayscale MJPEG streams sent by Axis cameras such as the
author
Sam Hocevar
<sam+ffmpeg@zoy.org>
Sat, 4 Aug 2007 20:49:39 +0000
(20:49 +0000)
committer
Diego Biurrun
<diego@biurrun.de>
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
Originally committed as revision 9913 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/mjpegdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mjpegdec.c
b/libavcodec/mjpegdec.c
index
aa8d2e4
..
fab30b0
100644
(file)
--- 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;