Commit b3625676 authored by Alex Beregszaszi's avatar Alex Beregszaszi
Browse files

changed rgba32_to routines to support both alpha and non-alpha formats (see r7066 too)

Originally committed as revision 7067 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8e96866a
......@@ -2060,6 +2060,12 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = {
[PIX_FMT_RGB24] = {
.convert = rgba32_to_rgb24
},
[PIX_FMT_BGR24] = {
.convert = rgba32_to_bgr24
},
[PIX_FMT_RGB565] = {
.convert = rgba32_to_rgb565
},
[PIX_FMT_RGB555] = {
.convert = rgba32_to_rgb555
},
......@@ -2074,6 +2080,9 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = {
},
},
[PIX_FMT_BGR24] = {
[PIX_FMT_RGBA32] = {
.convert = bgr24_to_rgba32
},
[PIX_FMT_RGB24] = {
.convert = bgr24_to_rgb24
},
......@@ -2099,6 +2108,9 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = {
},
},
[PIX_FMT_RGB565] = {
[PIX_FMT_RGBA32] = {
.convert = rgb565_to_rgba32
},
[PIX_FMT_RGB24] = {
.convert = rgb565_to_rgb24
},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment