Commit 37984ca1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '6a808f5a'

* commit '6a808f5a':
  libdc1394: Add support for MONO8 (gray) video mode
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c0997833 6a808f5a
......@@ -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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment