Commit f7b6ac77 authored by alex's avatar alex

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

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7067 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent ed96ac0e
...@@ -2060,6 +2060,12 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = { ...@@ -2060,6 +2060,12 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = {
[PIX_FMT_RGB24] = { [PIX_FMT_RGB24] = {
.convert = rgba32_to_rgb24 .convert = rgba32_to_rgb24
}, },
[PIX_FMT_BGR24] = {
.convert = rgba32_to_bgr24
},
[PIX_FMT_RGB565] = {
.convert = rgba32_to_rgb565
},
[PIX_FMT_RGB555] = { [PIX_FMT_RGB555] = {
.convert = rgba32_to_rgb555 .convert = rgba32_to_rgb555
}, },
...@@ -2074,6 +2080,9 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = { ...@@ -2074,6 +2080,9 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = {
}, },
}, },
[PIX_FMT_BGR24] = { [PIX_FMT_BGR24] = {
[PIX_FMT_RGBA32] = {
.convert = bgr24_to_rgba32
},
[PIX_FMT_RGB24] = { [PIX_FMT_RGB24] = {
.convert = bgr24_to_rgb24 .convert = bgr24_to_rgb24
}, },
...@@ -2099,6 +2108,9 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = { ...@@ -2099,6 +2108,9 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = {
}, },
}, },
[PIX_FMT_RGB565] = { [PIX_FMT_RGB565] = {
[PIX_FMT_RGBA32] = {
.convert = rgb565_to_rgba32
},
[PIX_FMT_RGB24] = { [PIX_FMT_RGB24] = {
.convert = rgb565_to_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