diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2002-02-08 03:09:46 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2002-02-08 03:09:46 +0000 |
commit | b72034dd49cc4896831b93b38370b04ed1bfc9fe (patch) | |
tree | c6d7d376079f0f701ccb45291601dc9a5d8738e3 /postproc/swscale.c | |
parent | 5bb9d9d8e84c5b5b78c8e50dc2005c8ce1cf7608 (diff) | |
download | ffmpeg-b72034dd49cc4896831b93b38370b04ed1bfc9fe.tar.gz |
bgr15 input support
Originally committed as revision 4581 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
Diffstat (limited to 'postproc/swscale.c')
-rw-r--r-- | postproc/swscale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/postproc/swscale.c b/postproc/swscale.c index 5d19a6b376..12cfa46ffd 100644 --- a/postproc/swscale.c +++ b/postproc/swscale.c @@ -17,7 +17,7 @@ */ /* - supported Input formats: YV12, I420, IYUV, YUY2, BGR32, BGR24, BGR16, RGB32, RGB24, Y8, Y800 + supported Input formats: YV12, I420, IYUV, YUY2, BGR32, BGR24, BGR16, BGR15, RGB32, RGB24, Y8, Y800 supported output formats: YV12, I420, IYUV, BGR15, BGR16, BGR24, BGR32 (grayscale soon too) BGR15/16 support dithering @@ -87,7 +87,7 @@ untested special converters #define isPacked(x) ((x)==IMGFMT_YUY2 || ((x)&IMGFMT_BGR_MASK)==IMGFMT_BGR || ((x)&IMGFMT_RGB_MASK)==IMGFMT_RGB) #define isGray(x) ((x)==IMGFMT_Y800) #define isSupportedIn(x) ((x)==IMGFMT_YV12 || (x)==IMGFMT_I420 || (x)==IMGFMT_YUY2 \ - || (x)==IMGFMT_BGR32|| (x)==IMGFMT_BGR24|| (x)==IMGFMT_BGR16\ + || (x)==IMGFMT_BGR32|| (x)==IMGFMT_BGR24|| (x)==IMGFMT_BGR16|| (x)==IMGFMT_BGR15\ || (x)==IMGFMT_RGB32|| (x)==IMGFMT_RGB24\ || (x)==IMGFMT_Y800) #define isSupportedOut(x) ((x)==IMGFMT_YV12 || (x)==IMGFMT_I420 \ |