diff options
author | Diego Biurrun <diego@biurrun.de> | 2007-02-12 23:07:17 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2007-02-12 23:07:17 +0000 |
commit | 3cf5b6bed7ee88662902467d1d33e631bd97da6d (patch) | |
tree | af72cff3069ab989a04d425a14d79157916b263e /libavcodec/imgconvert.c | |
parent | 5a4f1328efbdfff55606a0c5213b4a66009d3eff (diff) | |
download | ffmpeg-3cf5b6bed7ee88662902467d1d33e631bd97da6d.tar.gz |
consistency renaming: rgba32 --> rgb32
Originally committed as revision 7957 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/imgconvert.c')
-rw-r--r-- | libavcodec/imgconvert.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 0f6542f8a0..cd639332d2 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -1709,10 +1709,10 @@ static inline unsigned int bitcopy_n(unsigned int a, int n) #include "imgconvert_template.h" -/* rgba32 handling */ +/* rgb32 handling */ -#define RGB_NAME rgba32 -#define FMT_RGBA32 +#define RGB_NAME rgb32 +#define FMT_RGB32 #define RGB_IN(r, g, b, s)\ {\ @@ -1958,7 +1958,7 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = { .convert = yuv420p_to_rgb24 }, [PIX_FMT_RGB32] = { - .convert = yuv420p_to_rgba32 + .convert = yuv420p_to_rgb32 }, [PIX_FMT_UYVY422] = { .convert = yuv420p_to_uyvy422, @@ -1991,7 +1991,7 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = { .convert = yuvj420p_to_rgb24 }, [PIX_FMT_RGB32] = { - .convert = yuvj420p_to_rgba32 + .convert = yuvj420p_to_rgb32 }, }, [PIX_FMT_YUVJ444P] = { @@ -2026,7 +2026,7 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = { .convert = rgb24_to_rgb555 }, [PIX_FMT_RGB32] = { - .convert = rgb24_to_rgba32 + .convert = rgb24_to_rgb32 }, [PIX_FMT_BGR24] = { .convert = rgb24_to_bgr24 @@ -2049,30 +2049,30 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = { }, [PIX_FMT_RGB32] = { [PIX_FMT_RGB24] = { - .convert = rgba32_to_rgb24 + .convert = rgb32_to_rgb24 }, [PIX_FMT_BGR24] = { - .convert = rgba32_to_bgr24 + .convert = rgb32_to_bgr24 }, [PIX_FMT_RGB565] = { - .convert = rgba32_to_rgb565 + .convert = rgb32_to_rgb565 }, [PIX_FMT_RGB555] = { - .convert = rgba32_to_rgb555 + .convert = rgb32_to_rgb555 }, [PIX_FMT_PAL8] = { - .convert = rgba32_to_pal8 + .convert = rgb32_to_pal8 }, [PIX_FMT_YUV420P] = { - .convert = rgba32_to_yuv420p + .convert = rgb32_to_yuv420p }, [PIX_FMT_GRAY8] = { - .convert = rgba32_to_gray + .convert = rgb32_to_gray }, }, [PIX_FMT_BGR24] = { [PIX_FMT_RGB32] = { - .convert = bgr24_to_rgba32 + .convert = bgr24_to_rgb32 }, [PIX_FMT_RGB24] = { .convert = bgr24_to_rgb24 @@ -2089,7 +2089,7 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = { .convert = rgb555_to_rgb24 }, [PIX_FMT_RGB32] = { - .convert = rgb555_to_rgba32 + .convert = rgb555_to_rgb32 }, [PIX_FMT_YUV420P] = { .convert = rgb555_to_yuv420p @@ -2100,7 +2100,7 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = { }, [PIX_FMT_RGB565] = { [PIX_FMT_RGB32] = { - .convert = rgb565_to_rgba32 + .convert = rgb565_to_rgb32 }, [PIX_FMT_RGB24] = { .convert = rgb565_to_rgb24 @@ -2142,7 +2142,7 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = { .convert = gray_to_bgr24 }, [PIX_FMT_RGB32] = { - .convert = gray_to_rgba32 + .convert = gray_to_rgb32 }, [PIX_FMT_MONOWHITE] = { .convert = gray_to_monowhite @@ -2181,7 +2181,7 @@ static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = { .convert = pal8_to_rgb24 }, [PIX_FMT_RGB32] = { - .convert = pal8_to_rgba32 + .convert = pal8_to_rgb32 }, }, [PIX_FMT_UYYVYY411] = { @@ -2598,7 +2598,7 @@ int img_get_alpha_info(const AVPicture *src, return 0; switch(pix_fmt) { case PIX_FMT_RGB32: - ret = get_alpha_info_rgba32(src, width, height); + ret = get_alpha_info_rgb32(src, width, height); break; case PIX_FMT_PAL8: ret = get_alpha_info_pal8(src, width, height); |