Mercurial > mplayer.hg
changeset 30814:9257c04720ed
Avoid duplication of usePal() macro.
| author | stefano |
|---|---|
| date | Sat, 06 Mar 2010 11:50:54 +0000 |
| parents | 87acb5d9e4aa |
| children | 1878922f2ce0 |
| files | libswscale/swscale.c libswscale/swscale_internal.h libswscale/utils.c |
| diffstat | 3 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libswscale/swscale.c Sat Mar 06 11:27:31 2010 +0000 +++ b/libswscale/swscale.c Sat Mar 06 11:50:54 2010 +0000 @@ -92,7 +92,6 @@ || (x)==PIX_FMT_UYVY422 \ || isAnyRGB(x) \ ) -#define usePal(x) (av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) #define RGB2YUV_SHIFT 15 #define BY ( (int)(0.114*219/255*(1<<RGB2YUV_SHIFT)+0.5))
--- a/libswscale/swscale_internal.h Sat Mar 06 11:27:31 2010 +0000 +++ b/libswscale/swscale_internal.h Sat Mar 06 11:50:54 2010 +0000 @@ -442,6 +442,7 @@ || (x)==PIX_FMT_RGB32_1 \ || (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_dither8[2];
--- a/libswscale/utils.c Sat Mar 06 11:27:31 2010 +0000 +++ b/libswscale/utils.c Sat Mar 06 11:50:54 2010 +0000 @@ -150,8 +150,6 @@ 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]; const char *sws_format_name(enum PixelFormat format)