diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2006-11-14 19:53:22 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2006-11-14 19:53:22 +0000 |
| commit | b3625676058184f35ccf2531555ef1ed980bcc20 (patch) | |
| tree | 964b0391c910ae25e6fdd8ce8944b94c00ec23b5 /libavcodec/imgconvert.c | |
| parent | 8e96866a5268ed91476d0026d775a6cccec83f34 (diff) | |
| download | ffmpeg-b3625676058184f35ccf2531555ef1ed980bcc20.tar.gz | |
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
Diffstat (limited to 'libavcodec/imgconvert.c')
| -rw-r--r-- | libavcodec/imgconvert.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 855059a870..046feca1c6 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -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 }, |