aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-02-14 14:40:26 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-02-14 14:40:26 +0100
commit2f98537ea0749665b8dd70c31b7dc68b8a685cd1 (patch)
treeb41dbf6ea3e77b26cf9f22fe0da37d71320c13b5
parentebe645f02b3fbb8f1d9a03f9fcd496ebb59f4d05 (diff)
downloadffmpeg-2f98537ea0749665b8dd70c31b7dc68b8a685cd1.tar.gz
sws: dont write out of array on bigendian
Fixes Ticket2229 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4e2c63685e031e28d2296cff76473b963ee62ba1)
-rw-r--r--libswscale/swscale_unscaled.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 754edaf0e8..52951e0b43 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -595,6 +595,9 @@ static rgbConvFn findRgbConvFn(SwsContext *c)
}
}
+ if ((dstFormat == PIX_FMT_RGB32_1 || dstFormat == PIX_FMT_BGR32_1) && !isRGBA32(srcFormat) && ALT32_CORR<0)
+ return NULL;
+
return conv;
}