[FFmpeg-cvslog] swscale/output: Correct Alpha in yuv2ya16_X_c_template()

Michael Niedermayer git at videolan.org
Wed Oct 16 20:20:55 EEST 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Sep 26 17:13:16 2019 +0200| [3e6682931b482e7c6ca0d62cacbf8744e5d9ee47] | committer: Michael Niedermayer

swscale/output: Correct Alpha in yuv2ya16_X_c_template()

Untested, no testcase

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libswscale/output.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libswscale/output.c b/libswscale/output.c
index 60a9bdfe82..ed8a69287c 100644
--- a/libswscale/output.c
+++ b/libswscale/output.c
@@ -905,7 +905,7 @@ yuv2ya16_X_c_template(SwsContext *c, const int16_t *lumFilter,
     for (i = 0; i < dstW; i++) {
         int j;
         int Y = -0x40000000;
-        int64_t A = 0xffff<<14;
+        int64_t A = 0xffff;
 
         for (j = 0; j < lumFilterSize; j++)
             Y += lumSrc[j][i] * lumFilter[j];
@@ -915,6 +915,7 @@ yuv2ya16_X_c_template(SwsContext *c, const int16_t *lumFilter,
         Y = av_clip_uint16(Y);
 
         if (hasAlpha) {
+            A = 1<<14;
             for (j = 0; j < lumFilterSize; j++)
                 A += alpSrc[j][i] * lumFilter[j];
 
@@ -923,7 +924,7 @@ yuv2ya16_X_c_template(SwsContext *c, const int16_t *lumFilter,
         }
 
         output_pixel(&dest[2 * i    ], Y);
-        output_pixel(&dest[2 * i + 1], hasAlpha ? A : 65535);
+        output_pixel(&dest[2 * i + 1], A);
     }
 }
 



More information about the ffmpeg-cvslog mailing list