Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'

* commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c': swscale: support endianness conversion for AV_PIX_FMT_XYZ12 Conflicts: libswscale/swscale_unscaled.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · dce12f6948
parent 2060d94409 9cfa21c8c2
commit dce12f6948
1 changed files with 2 additions and 2 deletions
--- a/libswscale/utils.c
+++ b/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 },