summaryrefslogtreecommitdiff
path: root/libswscale
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2013-04-26 14:47:50 +0200
committerJanne Grunau <janne-libav@jannau.net>2013-05-06 21:48:14 +0200
commit9cfa21c8c2b81146aab574f55c93f27e5c2d435c (patch)
tree56e93b84a0e8e8e4d4aeeff320cc59f9f21f6b94 /libswscale
parentc1eb3e7fecdc270e03a700d61ef941600a6af491 (diff)
swscale: support endianness conversion for AV_PIX_FMT_XYZ12
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale_unscaled.c3
-rw-r--r--libswscale/utils.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index a994d6f2f5..433dbdb46e 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -1030,7 +1030,8 @@ void ff_get_unscaled_swscale(SwsContext *c)
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB444) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB48) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB555) ||
- IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB565))
+ IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB565) ||
+ IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_XYZ12))
c->swScale = packed_16bpc_bswap;
if ((usePal(srcFormat) && (
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 538a3df665..e20a5f1cee 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -172,6 +172,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
[AV_PIX_FMT_GBRP10BE] = { 1, 1 },
[AV_PIX_FMT_GBRP16LE] = { 1, 0 },
[AV_PIX_FMT_GBRP16BE] = { 1, 0 },
+ [AV_PIX_FMT_XYZ12BE] = { 0, 0, 1 },
+ [AV_PIX_FMT_XYZ12LE] = { 0, 0, 1 },
};
int sws_isSupportedInput(enum AVPixelFormat pix_fmt)