summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-31 10:16:05 +0000
committerstefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-31 10:16:05 +0000
commit3949328e2c4c353dbfb799cf9c12da6565f5ec51 (patch)
tree2768075b732b0c948f4532dfff53146bace70b6c
parenta81ed9c540d92ead8b276191ab136ab5d18885f4 (diff)
downloadmpv-3949328e2c4c353dbfb799cf9c12da6565f5ec51.tar.bz2
mpv-3949328e2c4c353dbfb799cf9c12da6565f5ec51.tar.xz
Declare support for the pixel formats:
PIX_FMT_YUVJ420P PIX_FMT_YUVJ422P PIX_FMT_YUVJ440P PIX_FMT_YUVJ444P in the isSupported{In,Out} macros. These pixel formats are not true pixel formats but hacks specific to JPEG in libavcodec. They are deprecated and should be removed (that is from libavcodec first and libswscale second)... but they must be tested by swscale-test. See thread: Subject: [FFmpeg-devel] [PATCH] Extend show_pix_fmts() to make it print the input/output support Date: 2010-01-30 15:54:08 GMT git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30474 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libswscale/utils.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 95edcb42a7..928a5fd85e 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -92,6 +92,10 @@ const char *swscale_license(void)
|| (x)==PIX_FMT_YUV444P \
|| (x)==PIX_FMT_YUV422P \
|| (x)==PIX_FMT_YUV411P \
+ || (x)==PIX_FMT_YUVJ420P \
+ || (x)==PIX_FMT_YUVJ422P \
+ || (x)==PIX_FMT_YUVJ440P \
+ || (x)==PIX_FMT_YUVJ444P \
|| (x)==PIX_FMT_PAL8 \
|| (x)==PIX_FMT_BGR8 \
|| (x)==PIX_FMT_RGB8 \
@@ -121,6 +125,10 @@ int sws_isSupportedInput(enum PixelFormat pix_fmt)
|| (x)==PIX_FMT_YUV444P \
|| (x)==PIX_FMT_YUV422P \
|| (x)==PIX_FMT_YUV411P \
+ || (x)==PIX_FMT_YUVJ420P \
+ || (x)==PIX_FMT_YUVJ422P \
+ || (x)==PIX_FMT_YUVJ440P \
+ || (x)==PIX_FMT_YUVJ444P \
|| isAnyRGB(x) \
|| (x)==PIX_FMT_NV12 \
|| (x)==PIX_FMT_NV21 \