diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-28 20:29:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-28 20:29:29 +0100 |
| commit | 37984ca13334f1715d33fd490ef243aea6c97c09 (patch) | |
| tree | 185980e50f8124e91e52e7b68004df64c9935222 /libavdevice | |
| parent | c099783316cf706c61e97256778fb77635f5e6e8 (diff) | |
| parent | 6a808f5ae17f1fcdbcfb18055872c12aef70ffff (diff) | |
| download | ffmpeg-streaming-37984ca13334f1715d33fd490ef243aea6c97c09.zip ffmpeg-streaming-37984ca13334f1715d33fd490ef243aea6c97c09.tar.gz | |
Merge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff'
* commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff':
libdc1394: Add support for MONO8 (gray) video mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/libdc1394.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index e9bd4c9..77024b3 100644 --- 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 */ |
