Mercurial > libavcodec.hg
diff imgconvert_template.h @ 4515:a2b14c6fccfd libavcodec
consistency renaming: rgba32 --> rgb32
| author | diego |
|---|---|
| date | Mon, 12 Feb 2007 23:07:17 +0000 |
| parents | 58412faefb46 |
| children | 45d083bbbbe7 |
line wrap: on
line diff
--- a/imgconvert_template.h Mon Feb 12 10:05:19 2007 +0000 +++ b/imgconvert_template.h Mon Feb 12 23:07:17 2007 +0000 @@ -411,10 +411,10 @@ } // RGB24 has optimised routines -#if !defined(FMT_RGBA32) && !defined(FMT_RGB24) +#if !defined(FMT_RGB32) && !defined(FMT_RGB24) /* alpha support */ -static void glue(rgba32_to_, RGB_NAME)(AVPicture *dst, const AVPicture *src, +static void glue(rgb32_to_, RGB_NAME)(AVPicture *dst, const AVPicture *src, int width, int height) { const uint8_t *s; @@ -451,7 +451,7 @@ } } -static void glue(RGB_NAME, _to_rgba32)(AVPicture *dst, const AVPicture *src, +static void glue(RGB_NAME, _to_rgb32)(AVPicture *dst, const AVPicture *src, int width, int height) { const uint8_t *s; @@ -485,7 +485,7 @@ } } -#endif /* !defined(FMT_RGBA32) */ +#endif /* !defined(FMT_RGB32) */ #ifndef FMT_RGB24 @@ -788,7 +788,7 @@ #endif /* FMT_RGB24 */ -#if defined(FMT_RGB24) || defined(FMT_RGBA32) +#if defined(FMT_RGB24) || defined(FMT_RGB32) static void glue(RGB_NAME, _to_pal8)(AVPicture *dst, const AVPicture *src, int width, int height) @@ -834,7 +834,7 @@ build_rgb_palette(dst->data[1], has_alpha); } -#endif /* defined(FMT_RGB24) || defined(FMT_RGBA32) */ +#endif /* defined(FMT_RGB24) || defined(FMT_RGB32) */ #ifdef RGBA_IN @@ -872,4 +872,4 @@ #undef BPP #undef RGB_NAME #undef FMT_RGB24 -#undef FMT_RGBA32 +#undef FMT_RGB32