summaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-21 20:14:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-21 21:21:00 +0100
commit95d04690aa4f43f6b61640713a11a9649cbf85e9 (patch)
treedfdb2c8564a15faeb6cf20e4048ffb70111abee5 /libswscale
parentfdb93996811bacfa7b82995cdc0f93c46f3dc6cc (diff)
downloadffmpeg-streaming-95d04690aa4f43f6b61640713a11a9649cbf85e9.zip
ffmpeg-streaming-95d04690aa4f43f6b61640713a11a9649cbf85e9.tar.gz
swscale/input: Fix alpha of YA16 input
Fixes Ticket4278 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/input.c8
1 files 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;
OpenPOWER on IntegriCloud