diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-08-15 13:38:12 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-08-15 14:38:03 +0200 |
| commit | aa2ba8c99e5708884a56aea9c1d96e014866f8a3 (patch) | |
| tree | 9aeb996d919f68f7e24dc9bdf161a56014191ca6 /libswscale/yuv2rgb.c | |
| parent | d258531502b24cb653204fe4f003c8815755bdc4 (diff) | |
swscale: Move extern declarations for tables to swscale_internal.h
Also add missing ff_ prefixes where necessary.
Diffstat (limited to 'libswscale/yuv2rgb.c')
| -rw-r--r-- | libswscale/yuv2rgb.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index 6c65cc2d2f..b51044606b 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -35,11 +35,6 @@ #include "swscale.h" #include "swscale_internal.h" -extern const uint8_t dither_4x4_16[4][8]; -extern const uint8_t dither_8x8_32[8][8]; -extern const uint8_t dither_8x8_73[8][8]; -extern const uint8_t dither_8x8_220[8][8]; - const int32_t ff_yuv2rgb_coeffs[8][4] = { { 117504, 138453, 13954, 34903 }, /* no sequence_display_extension */ { 117504, 138453, 13954, 34903 }, /* ITU-R Rec. 709 (1990) */ @@ -409,7 +404,7 @@ CLOSEYUV2RGBFUNC(8) // r, g, b, dst_1, dst_2 YUV2RGBFUNC(yuv2rgb_c_12_ordered_dither, uint16_t, 0) - const uint8_t *d16 = dither_4x4_16[y & 3]; + const uint8_t *d16 = ff_dither_4x4_16[y & 3]; #define PUTRGB12(dst, src, i, o) \ Y = src[2 * i]; \ @@ -440,8 +435,8 @@ CLOSEYUV2RGBFUNC(8) // r, g, b, dst_1, dst_2 YUV2RGBFUNC(yuv2rgb_c_8_ordered_dither, uint8_t, 0) - const uint8_t *d32 = dither_8x8_32[y & 7]; - const uint8_t *d64 = dither_8x8_73[y & 7]; + const uint8_t *d32 = ff_dither_8x8_32[y & 7]; + const uint8_t *d64 = ff_dither_8x8_73[y & 7]; #define PUTRGB8(dst, src, i, o) \ Y = src[2 * i]; \ @@ -471,8 +466,8 @@ YUV2RGBFUNC(yuv2rgb_c_8_ordered_dither, uint8_t, 0) CLOSEYUV2RGBFUNC(8) YUV2RGBFUNC(yuv2rgb_c_4_ordered_dither, uint8_t, 0) - const uint8_t * d64 = dither_8x8_73[y & 7]; - const uint8_t *d128 = dither_8x8_220[y & 7]; + const uint8_t * d64 = ff_dither_8x8_73[y & 7]; + const uint8_t *d128 = ff_dither_8x8_220[y & 7]; int acc; #define PUTRGB4D(dst, src, i, o) \ @@ -504,8 +499,8 @@ YUV2RGBFUNC(yuv2rgb_c_4_ordered_dither, uint8_t, 0) CLOSEYUV2RGBFUNC(4) YUV2RGBFUNC(yuv2rgb_c_4b_ordered_dither, uint8_t, 0) - const uint8_t *d64 = dither_8x8_73[y & 7]; - const uint8_t *d128 = dither_8x8_220[y & 7]; + const uint8_t *d64 = ff_dither_8x8_73[y & 7]; + const uint8_t *d128 = ff_dither_8x8_220[y & 7]; #define PUTRGB4DB(dst, src, i, o) \ Y = src[2 * i]; \ @@ -535,7 +530,7 @@ YUV2RGBFUNC(yuv2rgb_c_4b_ordered_dither, uint8_t, 0) CLOSEYUV2RGBFUNC(8) YUV2RGBFUNC(yuv2rgb_c_1_ordered_dither, uint8_t, 0) - const uint8_t *d128 = dither_8x8_220[y & 7]; + const uint8_t *d128 = ff_dither_8x8_220[y & 7]; char out_1 = 0, out_2 = 0; g = c->table_gU[128] + c->table_gV[128]; |