diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-29 13:51:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-20 14:38:26 +0200 |
| commit | a47bc9a05601138d8ccb529432e4c77d0f404430 (patch) | |
| tree | 0a5482a29bde64585036c29b87e679063f053b51 | |
| parent | 925adad3e07421daddc73148af87d91550a2c6b5 (diff) | |
| download | ffmpeg-a47bc9a05601138d8ccb529432e4c77d0f404430.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>
(cherry picked from commit f6ab967eae497733f6adc12b30075980fd6eea98)
Conflicts:
tests/ref/fate/dds-rgb16
| -rw-r--r-- | libswscale/swscale_unscaled.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index da457dfbdb..d3d0cf30b2 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1242,6 +1242,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; } |