Merge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff'

* commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff': libdc1394: Add support for MONO8 (gray) video mode Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 37984ca133
parent c099783316 6a808f5ae1
commit 37984ca133
1 changed files with 1 additions and 0 deletions
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@ -75,6 +75,7 @@ struct dc1394_frame_format {
    int frame_size_id;
 } dc1394_frame_formats[] = {
    { 320, 240, AV_PIX_FMT_UYVY422,   DC1394_VIDEO_MODE_320x240_YUV422 },
+    { 640, 480, AV_PIX_FMT_GRAY8,     DC1394_VIDEO_MODE_640x480_MONO8 },
    { 640, 480, AV_PIX_FMT_UYYVYY411, DC1394_VIDEO_MODE_640x480_YUV411 },
    { 640, 480, AV_PIX_FMT_UYVY422,   DC1394_VIDEO_MODE_640x480_YUV422 },
    { 0, 0, 0, 0 } /* gotta be the last one */