diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-29 13:51:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-29 13:54:35 +0200 |
| commit | f6ab967eae497733f6adc12b30075980fd6eea98 (patch) | |
| tree | 52ac8207c7a8322f65834dd80b5aa8b5733f03d0 | |
| parent | d9deae04a78b6b698b90d050a67a3bd9155aba74 (diff) | |
| download | ffmpeg-f6ab967eae497733f6adc12b30075980fd6eea98.tar.gz | |
swscale/swscale_unscaled: Fix rounding difference with RGBA output between little and big endian
Fixes fate/dds-rgb16 on big endian
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/swscale_unscaled.c | 5 | ||||
| -rw-r--r-- | tests/ref/fate/dds-rgb16 | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index b426fa188b..1dc42c81e1 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1243,6 +1243,11 @@ static rgbConvFn findRgbConvFn(SwsContext *c) if ((dstFormat == AV_PIX_FMT_RGB32_1 || dstFormat == AV_PIX_FMT_BGR32_1) && !isRGBA32(srcFormat) && ALT32_CORR<0) return NULL; + // Maintain symmetry between endianness + if (c->flags & SWS_BITEXACT) + if ((dstFormat == AV_PIX_FMT_RGB32 || dstFormat == AV_PIX_FMT_BGR32 ) && !isRGBA32(srcFormat) && ALT32_CORR>0) + return NULL; + return conv; } diff --git a/tests/ref/fate/dds-rgb16 b/tests/ref/fate/dds-rgb16 index 96e73684a6..688d3b9601 100644 --- a/tests/ref/fate/dds-rgb16 +++ b/tests/ref/fate/dds-rgb16 @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 32768, 0x1ec4fed2 +0, 0, 0, 1, 32768, 0x7991785d |