From 95666b22989b9b9f91a27da01b2bdbf4ee8022d3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 2 Oct 2013 18:11:28 +0200 Subject: [PATCH] avcodec/imgconvert/get_color_type: fix type for PAL8 Fixes Ticket3008 Fate changes as PAL8 gets used instead of BGR8 Signed-off-by: Michael Niedermayer --- libavcodec/imgconvert.c | 3 +++ tests/ref/lavf/gif | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index d9dc55d325..ee58cfb49a 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -71,6 +71,9 @@ void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int } static int get_color_type(const AVPixFmtDescriptor *desc) { + if (desc->flags & AV_PIX_FMT_FLAG_PAL) + return FF_COLOR_RGB; + if(desc->nb_components == 1 || desc->nb_components == 2) return FF_COLOR_GRAY; diff --git a/tests/ref/lavf/gif b/tests/ref/lavf/gif index 531cd1eda7..4d90abe38f 100644 --- a/tests/ref/lavf/gif +++ b/tests/ref/lavf/gif @@ -1,3 +1,3 @@ -e35f5ea283bbcb249818e0078ec72664 *./tests/data/lavf/lavf.gif -2011766 ./tests/data/lavf/lavf.gif +8aef8081e8afa445f63f320f4a1c5edb *./tests/data/lavf/lavf.gif +2030198 ./tests/data/lavf/lavf.gif ./tests/data/lavf/lavf.gif CRC=0x0dc5477c