aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-26 15:07:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-26 15:14:00 +0200
commit034b31df2cd05751f7242887192292777f779bbd (patch)
tree281d5de12a8bdebdabd18ec621c2a45f66eecf8c
parentee97982408c83766a3dcb235a673761da629cf99 (diff)
downloadffmpeg-034b31df2cd05751f7242887192292777f779bbd.tar.gz
swscale: Fix PAL8 input with alpha
Fixes Ticket2158 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libswscale/swscale_internal.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 3d5d2affd8..2241ba5235 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -742,6 +742,8 @@ static av_always_inline int isALPHA(enum AVPixelFormat pix_fmt)
{
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
av_assert0(desc);
+ if (pix_fmt == AV_PIX_FMT_PAL8)
+ return 1;
return desc->flags & AV_PIX_FMT_FLAG_ALPHA;
}