diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-02 18:11:28 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-10-02 23:47:41 +0200 |
| commit | f089e67d515b726ac14103025edc04f6df346a3f (patch) | |
| tree | f3b8b8b974886659a8dfc3816e06badcea3d84b1 | |
| parent | 842d7c9b3af0ea6327bbc8b4554f5fa35f3b73ac (diff) | |
| download | ffmpeg-f089e67d515b726ac14103025edc04f6df346a3f.tar.gz | |
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 <michaelni@gmx.at>
(cherry picked from commit 95666b22989b9b9f91a27da01b2bdbf4ee8022d3)
| -rw-r--r-- | libavcodec/imgconvert.c | 3 | ||||
| -rw-r--r-- | tests/ref/lavf/gif | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 1835e00fbe..3abd6e6828 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 |