summaryrefslogtreecommitdiff
path: root/libswscale
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-01-31 10:16:05 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-01-31 10:16:05 +0000
commitaf0e66216952c170c0acb28398f1c543b6f3d8d2 (patch)
treec7e9c7ff2907ca15c42fcf88eca0ab6e82102745 /libswscale
parent37b2b0d6cd2ac0f556ae41251385e6c5493d6bcc (diff)
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 Originally committed as revision 30474 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale')
-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 \