generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid duplication of usePal() macro.

Browse Source 
Originally committed as revision 30856 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
Stefano Sabatini
2010-03-06 11:50:54 +00:00
parent a4e441301d
commit 3de42635bd
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libswscale/swscale.c
View File

@@ -92,7 +92,6 @@ untested special converters
|| (x)==PIX_FMT_UYVY422 \ || (x)==PIX_FMT_UYVY422 \
|| isAnyRGB(x) \ || isAnyRGB(x) \
) )
#define usePal(x) (av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL)
#define RGB2YUV_SHIFT 15 #define RGB2YUV_SHIFT 15
#define BY ( (int)(0.114*219/255*(1<<RGB2YUV_SHIFT)+0.5)) #define BY ( (int)(0.114*219/255*(1<<RGB2YUV_SHIFT)+0.5))

1
libswscale/swscale_internal.h
View File

@@ -442,6 +442,7 @@ const char *sws_format_name(enum PixelFormat format);
|| (x)==PIX_FMT_RGB32_1 \ || (x)==PIX_FMT_RGB32_1 \
|| (x)==PIX_FMT_YUVA420P \ || (x)==PIX_FMT_YUVA420P \
) )
#define usePal(x) (av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL)
extern const uint64_t ff_dither4[2]; extern const uint64_t ff_dither4[2];
extern const uint64_t ff_dither8[2]; extern const uint64_t ff_dither8[2];

2
libswscale/utils.c
View File

@@ -150,8 +150,6 @@ int sws_isSupportedOutput(enum PixelFormat pix_fmt)
return isSupportedOut(pix_fmt); return isSupportedOut(pix_fmt);
} }
#define usePal(x) (av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL)
extern const int32_t ff_yuv2rgb_coeffs[8][4]; extern const int32_t ff_yuv2rgb_coeffs[8][4];
const char *sws_format_name(enum PixelFormat format) const char *sws_format_name(enum PixelFormat format)