RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

swscale: fix failing fate tests. 

isGray() is left as a FIXME for later.
This commit is contained in:
Ronald S. Bultje 2011-11-24 12:21:03 -08:00
parent 185655c601
commit f7f1835258
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/pixdesc.c
View File

@ -219,7 +219,6 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ {0,0,1,0,7}, /* Y */
}, },
.flags = PIX_FMT_PAL,
}, },
[PIX_FMT_MONOWHITE] = { [PIX_FMT_MONOWHITE] = {
.name = "monow", .name = "monow",
@ -567,7 +566,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,5,3,0,15}, /* G */ {0,5,3,0,15}, /* G */
{0,5,5,0,15}, /* B */ {0,5,5,0,15}, /* B */
}, },
.flags = PIX_FMT_BE, .flags = PIX_FMT_RGB | PIX_FMT_BE,
}, },
[PIX_FMT_RGB48LE] = { [PIX_FMT_RGB48LE] = {
.name = "rgb48le", .name = "rgb48le",

9
libswscale/swscale_internal.h
View File

@ -552,9 +552,18 @@ const char *sws_format_name(enum PixelFormat format);
#define isRGB(x) \ #define isRGB(x) \
(av_pix_fmt_descriptors[x].flags & PIX_FMT_RGB) (av_pix_fmt_descriptors[x].flags & PIX_FMT_RGB)
#if 0 // FIXME
#define isGray(x) \ #define isGray(x) \
(!(av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) && \ (!(av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) && \
av_pix_fmt_descriptors[x].nb_components <= 2) av_pix_fmt_descriptors[x].nb_components <= 2)
#else
#define isGray(x) ( \
(x)==PIX_FMT_GRAY8 \
|| (x)==PIX_FMT_Y400A \
|| (x)==PIX_FMT_GRAY16BE \
|| (x)==PIX_FMT_GRAY16LE \
)
#endif
#define isRGBinInt(x) ( \ #define isRGBinInt(x) ( \
(x)==PIX_FMT_RGB48BE \ (x)==PIX_FMT_RGB48BE \