diff options
| author | rogerdpack <rogerpack2005@gmail.com> | 2013-01-15 17:07:54 -0700 |
|---|---|---|
| committer | rogerdpack <rogerpack2005@gmail.com> | 2013-01-15 17:07:54 -0700 |
| commit | a50049a197a5c2964060c447e2675c21b98d94ba (patch) | |
| tree | 50ad333e7d1bb0c9adb52c43252212bc6f06460e | |
| parent | 4484c722f68e6a54b8bd701d391897bc092b4404 (diff) | |
| download | ffmpeg-a50049a197a5c2964060c447e2675c21b98d94ba.tar.gz | |
dshow: use standardized raw pixel format lookup
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
| -rw-r--r-- | libavdevice/dshow.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 83b5e01042..342831d9e1 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -25,6 +25,7 @@ #include "libavformat/internal.h" #include "avdevice.h" #include "dshow_capture.h" +#include "libavcodec/raw.h" struct dshow_ctx { const AVClass *class; @@ -73,12 +74,6 @@ struct dshow_ctx { static enum AVPixelFormat dshow_pixfmt(DWORD biCompression, WORD biBitCount) { switch(biCompression) { - case MKTAG('U', 'Y', 'V', 'Y'): - return AV_PIX_FMT_UYVY422; - case MKTAG('Y', 'U', 'Y', '2'): - return AV_PIX_FMT_YUYV422; - case MKTAG('I', '4', '2', '0'): - return AV_PIX_FMT_YUV420P; case BI_BITFIELDS: case BI_RGB: switch(biBitCount) { /* 1-8 are untested */ @@ -96,7 +91,7 @@ static enum AVPixelFormat dshow_pixfmt(DWORD biCompression, WORD biBitCount) return AV_PIX_FMT_RGB32; } } - return AV_PIX_FMT_NONE; + return avpriv_find_pix_fmt(ff_raw_pix_fmt_tags, biCompression); // all others } static enum AVCodecID dshow_codecid(DWORD biCompression) |