diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 01:14:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 01:14:45 +0200 |
| commit | 41a097aada4d45bddb492bb47d64e67423001775 (patch) | |
| tree | 462100064dc3808b56bfcd96804cac15e5a974c9 /libswscale/swscale_internal.h | |
| parent | ae3ee72e02ecbbde53391a25175c7eed66fc9ffd (diff) | |
| parent | b991b300f2d60f7726cdc2b15fd12591b89dc972 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Unscaled Planar RGB -> RGB support in swscale.
Conflicts:
libswscale/swscale_unscaled.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, 8 insertions, 0 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index e73806ecc2..fb2776c093 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -681,6 +681,14 @@ const char *sws_format_name(enum PixelFormat format); (av_pix_fmt_descriptors[x].nb_components >= 2 && \ (av_pix_fmt_descriptors[x].flags & PIX_FMT_PLANAR)) +#define isPackedRGB(x) \ + ((av_pix_fmt_descriptors[x].flags & \ + (PIX_FMT_PLANAR | PIX_FMT_RGB)) == PIX_FMT_RGB) + +#define isPlanarRGB(x) \ + ((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) || \ (av_pix_fmt_descriptors[x].flags & PIX_FMT_PSEUDOPAL) || \ (x) == PIX_FMT_Y400A) |