Commit b13ba5cb authored by Michael Niedermayer's avatar Michael Niedermayer

swscale: use isByteRGB() to simplify check for palToRgbWrapper.

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 307b6502
...@@ -705,13 +705,7 @@ void ff_get_unscaled_swscale(SwsContext *c) ...@@ -705,13 +705,7 @@ void ff_get_unscaled_swscale(SwsContext *c)
if (isAnyRGB(srcFormat) && isPlanar(srcFormat) && isByteRGB(dstFormat)) if (isAnyRGB(srcFormat) && isPlanar(srcFormat) && isByteRGB(dstFormat))
c->swScale= planarRgbToRgbWrapper; c->swScale= planarRgbToRgbWrapper;
if ((usePal(srcFormat) && ( if (usePal(srcFormat) && isByteRGB(dstFormat))
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)))
c->swScale= palToRgbWrapper; c->swScale= palToRgbWrapper;
if (srcFormat == PIX_FMT_YUV422P) { if (srcFormat == PIX_FMT_YUV422P) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment