diff options
| author | Marc Hoffman <mmhoffm@gmail.com> | 2007-06-04 13:28:02 +0000 |
|---|---|---|
| committer | Marc Hoffman <mmhoffm@gmail.com> | 2007-06-04 13:28:02 +0000 |
| commit | 69621690ab41c28de67972f6c371af96d2b57296 (patch) | |
| tree | 4043cacdf02a0d4c285f39aef155b68fc900ee96 /libavformat/grab.c | |
| parent | c7c64e9e5e2447f588cdc9f4a035a827b2350dc5 (diff) | |
extending video4linux support to handle the additional formats UYVY, YUYV and RGB565
Originally committed as revision 9203 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/grab.c')
| -rw-r--r-- | libavformat/grab.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/grab.c b/libavformat/grab.c index df30daefe4..56d16a950d 100644 --- a/libavformat/grab.c +++ b/libavformat/grab.c @@ -60,8 +60,11 @@ struct { } video_formats [] = { {.palette = VIDEO_PALETTE_YUV420P, .depth = 12, .pix_fmt = PIX_FMT_YUV420P }, {.palette = VIDEO_PALETTE_YUV422, .depth = 16, .pix_fmt = PIX_FMT_YUYV422 }, + {.palette = VIDEO_PALETTE_UYVY, .depth = 16, .pix_fmt = PIX_FMT_UYVY422 }, + {.palette = VIDEO_PALETTE_YUYV, .depth = 16, .pix_fmt = PIX_FMT_YUYV422 }, /* NOTE: v4l uses BGR24, not RGB24 */ {.palette = VIDEO_PALETTE_RGB24, .depth = 24, .pix_fmt = PIX_FMT_BGR24 }, + {.palette = VIDEO_PALETTE_RGB565, .depth = 16, .pix_fmt = PIX_FMT_BGR565 }, {.palette = VIDEO_PALETTE_GREY, .depth = 8, .pix_fmt = PIX_FMT_GRAY8 }, }; |