diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 21:21:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 21:50:37 +0200 |
| commit | 367d9b2957fa455b59f131fd6bee896cb7ed6600 (patch) | |
| tree | 4c6f6a32752bc64d7aea93e37d4bd5666cd6ecb9 /libswscale/swscale_internal.h | |
| parent | 62e5ef95cacb29b5ee3149792f12f9204dbd1655 (diff) | |
| parent | ef0ee7f657e66d91162d2b4fad882ece9fbb264e (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: K&R formatting cosmetics (part II)
tiffdec: Add a malloc check and refactor another.
faxcompr: Check malloc results and unify return path
configure: escape colons in values written to config.fate
ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE
matroska: Fix leaking memory allocated for laces.
pthread: Fix crash due to fctx->delaying not being cleared.
vp3: Assert on invalid filter_limit values.
h264: fix 10bit biweight functions after recent x86inc.asm fixes.
ffv1: Fix size mismatch in encode_line.
movenc: Remove a dead initialization
git-howto: Explain how to avoid Windows line endings in git checkouts.
build: Move all arch OBJS declarations into arch subdirectory Makefiles.
Conflicts:
configure
libavcodec/vp3.c
libavformat/matroskadec.c
libavutil/Makefile
libswscale/Makefile
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_internal.h')
| -rw-r--r-- | libswscale/swscale_internal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index fb2776c093..ae53b88e7f 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -657,8 +657,8 @@ const char *sws_format_name(enum PixelFormat format); (x)==PIX_FMT_GBR24P \ ) -#define isALPHA(x) \ - (av_pix_fmt_descriptors[x].nb_components == 2 || \ +#define isALPHA(x) \ + (av_pix_fmt_descriptors[x].nb_components == 2 || \ av_pix_fmt_descriptors[x].nb_components == 4) #if 1 @@ -677,7 +677,7 @@ const char *sws_format_name(enum PixelFormat format); (x) == PIX_FMT_PAL8) #endif -#define isPlanar(x) \ +#define isPlanar(x) \ (av_pix_fmt_descriptors[x].nb_components >= 2 && \ (av_pix_fmt_descriptors[x].flags & PIX_FMT_PLANAR)) @@ -689,7 +689,7 @@ const char *sws_format_name(enum PixelFormat format); ((av_pix_fmt_descriptors[x].flags & \ (PIX_FMT_PLANAR | PIX_FMT_RGB)) == (PIX_FMT_PLANAR | PIX_FMT_RGB)) -#define usePal(x) ((av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) || \ +#define usePal(x) ((av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) || \ (av_pix_fmt_descriptors[x].flags & PIX_FMT_PSEUDOPAL) || \ (x) == PIX_FMT_Y400A) |