[FFmpeg-cvslog] swscale/input: Fix alpha of YA16 input

Michael Niedermayer git at videolan.org
Thu Feb 12 18:11:50 CET 2015


ffmpeg | branch: release/2.5 | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 21 20:14:34 2015 +0100| [b62b3e1a25aaf4fe8ad0a46a0ee0f9e361e0187d] | committer: Michael Niedermayer

swscale/input: Fix alpha of YA16 input

Fixes Ticket4278

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 95d04690aa4f43f6b61640713a11a9649cbf85e9)

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b62b3e1a25aaf4fe8ad0a46a0ee0f9e361e0187d
---

 libswscale/input.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libswscale/input.c b/libswscale/input.c
index 6716f0d..1928223 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;



More information about the ffmpeg-cvslog mailing list