Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-09-10 15:30:21 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2015-09-10 16:00:19 +0300
commit319898bba254105aad2bd50233c3c2867f73695a (patch)
tree25825502e930d7591eca73d27af3232f91514310 /libswscale
parent816cf5181e35ebb595634762a45c7c94cd7b6760 (diff)
swscale/utils: handle gray+alpha formats like gray for luma ranges
Its illogic to handle gray differently depending on the existence of an alpha channel Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/utils.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 777f85e46b..450d0d55df 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -981,8 +981,11 @@ static int handle_jpeg(enum AVPixelFormat *format)
*format = AV_PIX_FMT_YUV440P;
return 1;
case AV_PIX_FMT_GRAY8:
+ case AV_PIX_FMT_YA8:
case AV_PIX_FMT_GRAY16LE:
case AV_PIX_FMT_GRAY16BE:
+ case AV_PIX_FMT_YA16BE:
+ case AV_PIX_FMT_YA16LE:
return 1;
default:
return 0;