summaryrefslogtreecommitdiff
path: root/libswscale
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-06 13:30:10 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-06 13:30:10 +0100
commitb13ba5cb9a1a56883f0a8e7f7b02f7a1330ccb6d (patch)
tree2d08b972c91d3b74aaab3eb5b4efd110994552b3 /libswscale
parent307b6502701b93a8dad82756d91370e1233adb2d (diff)
swscale: use isByteRGB() to simplify check for palToRgbWrapper.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale_unscaled.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 90603c2280..79cb74cfeb 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -705,13 +705,7 @@ void ff_get_unscaled_swscale(SwsContext *c)
if (isAnyRGB(srcFormat) && isPlanar(srcFormat) && isByteRGB(dstFormat))
c->swScale= planarRgbToRgbWrapper;
- if ((usePal(srcFormat) && (
- dstFormat == PIX_FMT_RGB32 ||
- dstFormat == PIX_FMT_RGB32_1 ||
- dstFormat == PIX_FMT_RGB24 ||
- dstFormat == PIX_FMT_BGR32 ||
- dstFormat == PIX_FMT_BGR32_1 ||
- dstFormat == PIX_FMT_BGR24)))
+ if (usePal(srcFormat) && isByteRGB(dstFormat))
c->swScale= palToRgbWrapper;
if (srcFormat == PIX_FMT_YUV422P) {