diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-21 20:14:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-12 17:10:35 +0100 |
| commit | b62b3e1a25aaf4fe8ad0a46a0ee0f9e361e0187d (patch) | |
| tree | 3c48d3af9d6e1d0672a3e1060aa04b6acc71bff8 | |
| parent | a45b8af839fd44e52b77a2436a465939969a6d11 (diff) | |
| download | ffmpeg-b62b3e1a25aaf4fe8ad0a46a0ee0f9e361e0187d.tar.gz | |
swscale/input: Fix alpha of YA16 input
Fixes Ticket4278
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 95d04690aa4f43f6b61640713a11a9649cbf85e9)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/input.c | 8 |
1 files changed, 6 insertions, 2 deletions
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; |