diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-03-06 11:50:54 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-03-06 11:50:54 +0000 |
| commit | 3de42635bdb4b807910c53cb416625f843f92ad5 (patch) | |
| tree | a37145b1cee42c74c0073d2a07995a9fb512c3ba | |
| parent | a4e441301d55693454d07e0b940e4f427105e255 (diff) | |
| download | ffmpeg-streaming-3de42635bdb4b807910c53cb416625f843f92ad5.zip ffmpeg-streaming-3de42635bdb4b807910c53cb416625f843f92ad5.tar.gz | |
Avoid duplication of usePal() macro.
Originally committed as revision 30856 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
| -rw-r--r-- | libswscale/swscale.c | 1 | ||||
| -rw-r--r-- | libswscale/swscale_internal.h | 1 | ||||
| -rw-r--r-- | libswscale/utils.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index ab77537..0b1faa1 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -92,7 +92,6 @@ untested special converters || (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)) diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index aebe30e..5be17d4 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -442,6 +442,7 @@ const char *sws_format_name(enum PixelFormat format); || (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]; diff --git a/libswscale/utils.c b/libswscale/utils.c index fbd44bc..1674d76 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -150,8 +150,6 @@ int sws_isSupportedOutput(enum PixelFormat 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]; const char *sws_format_name(enum PixelFormat format) |
