diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-01-22 10:56:42 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:38:34 +0100 |
commit | 8b9b6041d7d4fe284deecc6075a3ce68d715e971 (patch) | |
tree | 1aeb3511863d1bf9252bb6aa0f4b654ed4af639d /libavcodec/imgconvert.c | |
parent | 99ace37e68c122f0b051ac2937535960238b38f4 (diff) | |
download | ffmpeg-8b9b6041d7d4fe284deecc6075a3ce68d715e971.tar.gz |
lavc: remove disabled FF_API_GET_ALPHA_INFO cruft.
Diffstat (limited to 'libavcodec/imgconvert.c')
-rw-r--r-- | libavcodec/imgconvert.c | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index eeffc3f133..07b7edfd52 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -855,55 +855,6 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, return 0; } -#if FF_API_GET_ALPHA_INFO -/* NOTE: we scan all the pixels to have an exact information */ -static int get_alpha_info_pal8(const AVPicture *src, int width, int height) -{ - const unsigned char *p; - int src_wrap, ret, x, y; - unsigned int a; - uint32_t *palette = (uint32_t *)src->data[1]; - - p = src->data[0]; - src_wrap = src->linesize[0] - width; - ret = 0; - for(y=0;y<height;y++) { - for(x=0;x<width;x++) { - a = palette[p[0]] >> 24; - if (a == 0x00) { - ret |= FF_ALPHA_TRANSP; - } else if (a != 0xff) { - ret |= FF_ALPHA_SEMI_TRANSP; - } - p++; - } - p += src_wrap; - } - return ret; -} - -int img_get_alpha_info(const AVPicture *src, - enum PixelFormat pix_fmt, int width, int height) -{ - const PixFmtInfo *pf = &pix_fmt_info[pix_fmt]; - int ret; - - /* no alpha can be represented in format */ - if (!pf->is_alpha) - return 0; - switch(pix_fmt) { - case PIX_FMT_PAL8: - ret = get_alpha_info_pal8(src, width, height); - break; - default: - /* we do not know, so everything is indicated */ - ret = FF_ALPHA_TRANSP | FF_ALPHA_SEMI_TRANSP; - break; - } - return ret; -} -#endif - #if !(HAVE_MMX && HAVE_YASM) /* filter parameters: [-1 4 2 4 -1] // 8 */ static void deinterlace_line_c(uint8_t *dst, |