Index: patched-ffmpeg-mt/libswscale/swscale_internal.h |
=================================================================== |
--- patched-ffmpeg-mt/libswscale/swscale_internal.h (revision 41250) |
+++ patched-ffmpeg-mt/libswscale/swscale_internal.h (working copy) |
@@ -385,32 +385,56 @@ |
(x)==PIX_FMT_GRAY16BE \ |
|| (x)==PIX_FMT_GRAY16LE \ |
) |
-#define isRGB(x) ( \ |
+#define isRGBinInt(x) ( \ |
(x)==PIX_FMT_RGB48BE \ |
|| (x)==PIX_FMT_RGB48LE \ |
|| (x)==PIX_FMT_RGB32 \ |
|| (x)==PIX_FMT_RGB32_1 \ |
|| (x)==PIX_FMT_RGB24 \ |
- || (x)==PIX_FMT_RGB565 \ |
- || (x)==PIX_FMT_RGB555 \ |
+ || (x)==PIX_FMT_RGB565BE \ |
+ || (x)==PIX_FMT_RGB565LE \ |
+ || (x)==PIX_FMT_RGB555BE \ |
+ || (x)==PIX_FMT_RGB555LE \ |
+ || (x)==PIX_FMT_RGB444BE \ |
+ || (x)==PIX_FMT_RGB444LE \ |
|| (x)==PIX_FMT_RGB8 \ |
|| (x)==PIX_FMT_RGB4 \ |
|| (x)==PIX_FMT_RGB4_BYTE \ |
|| (x)==PIX_FMT_MONOBLACK \ |
|| (x)==PIX_FMT_MONOWHITE \ |
) |
-#define isBGR(x) ( \ |
+#define isBGRinInt(x) ( \ |
(x)==PIX_FMT_BGR32 \ |
|| (x)==PIX_FMT_BGR32_1 \ |
|| (x)==PIX_FMT_BGR24 \ |
- || (x)==PIX_FMT_BGR565 \ |
- || (x)==PIX_FMT_BGR555 \ |
+ || (x)==PIX_FMT_BGR565BE \ |
+ || (x)==PIX_FMT_BGR565LE \ |
+ || (x)==PIX_FMT_BGR555BE \ |
+ || (x)==PIX_FMT_BGR555LE \ |
+ || (x)==PIX_FMT_BGR444BE \ |
+ || (x)==PIX_FMT_BGR444LE \ |
|| (x)==PIX_FMT_BGR8 \ |
|| (x)==PIX_FMT_BGR4 \ |
|| (x)==PIX_FMT_BGR4_BYTE \ |
|| (x)==PIX_FMT_MONOBLACK \ |
|| (x)==PIX_FMT_MONOWHITE \ |
) |
+#define isRGBinBytes(x) ( \ |
+ (x)==PIX_FMT_RGB48BE \ |
+ || (x)==PIX_FMT_RGB48LE \ |
+ || (x)==PIX_FMT_RGBA \ |
+ || (x)==PIX_FMT_ARGB \ |
+ || (x)==PIX_FMT_RGB24 \ |
+ ) |
+#define isBGRinBytes(x) ( \ |
+ (x)==PIX_FMT_BGRA \ |
+ || (x)==PIX_FMT_ABGR \ |
+ || (x)==PIX_FMT_BGR24 \ |
+ ) |
+#define isAnyRGB(x) ( \ |
+ isRGBinInt(x) \ |
+ || isBGRinInt(x) \ |
+ ) |
#define isALPHA(x) ( \ |
(x)==PIX_FMT_BGR32 \ |
|| (x)==PIX_FMT_BGR32_1 \ |
@@ -418,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]; |