Merge commit '9cfa21c8'

* commit '9cfa21c8':
  swscale: support endianness conversion for AV_PIX_FMT_XYZ12

Conflicts:
	libswscale/swscale_unscaled.c
	libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libswscale/utils.c

@@ -198,8 +198,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
     [AV_PIX_FMT_GBRP14BE]    = { 1, 1 },
     [AV_PIX_FMT_GBRP16LE]    = { 1, 0 },
     [AV_PIX_FMT_GBRP16BE]    = { 1, 0 },
-    [AV_PIX_FMT_XYZ12BE]     = { 1, 0 },
-    [AV_PIX_FMT_XYZ12LE]     = { 1, 0 },
+    [AV_PIX_FMT_XYZ12BE]     = { 1, 0, 1 },
+    [AV_PIX_FMT_XYZ12LE]     = { 1, 0, 1 },
     [AV_PIX_FMT_GBRAP]       = { 0, 0 },
     [AV_PIX_FMT_GBRAP16LE]   = { 0, 0 },
     [AV_PIX_FMT_GBRAP16BE]   = { 0, 0 },