From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 21 Jan 2015 19:14:34 +0000 (+0100)
Subject: swscale/input: Fix alpha of YA16 input
X-Git-Tag: android-x86-6.0-r1~832
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=95d04690aa4f43f6b61640713a11a9649cbf85e9;p=android-x86%2Fexternal-ffmpeg.git

swscale/input: Fix alpha of YA16 input

Fixes Ticket4278

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libswscale/input.c b/libswscale/input.c
index 6716f0dcec..1928223951 100644
--- a/libswscale/input.c
+++ b/libswscale/input.c
@@ -1249,11 +1249,9 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
 #endif
     case AV_PIX_FMT_YA16LE:
         c->lumToYV12 = read_ya16le_gray_c;
-        c->alpToYV12 = read_ya16le_alpha_c;
         break;
     case AV_PIX_FMT_YA16BE:
         c->lumToYV12 = read_ya16be_gray_c;
-        c->alpToYV12 = read_ya16be_alpha_c;
         break;
     case AV_PIX_FMT_YUYV422:
     case AV_PIX_FMT_YVYU422:
@@ -1375,6 +1373,12 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
         case AV_PIX_FMT_YA8:
             c->alpToYV12 = uyvyToY_c;
             break;
+        case AV_PIX_FMT_YA16LE:
+            c->alpToYV12 = read_ya16le_alpha_c;
+            break;
+        case AV_PIX_FMT_YA16BE:
+            c->alpToYV12 = read_ya16be_alpha_c;
+            break;
         case AV_PIX_FMT_PAL8 :
             c->alpToYV12 = palToA_c;
             break;