diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-14 23:51:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-15 01:23:29 +0200 |
| commit | 3662e49dde0b193244eae6b8e1ab236aeb247632 (patch) | |
| tree | 58e7502e01151f98edbeef737b25e4c14ab6d4ae | |
| parent | e66a10689bf26130391e549006d85b0331183230 (diff) | |
| download | ffmpeg-3662e49dde0b193244eae6b8e1ab236aeb247632.tar.gz | |
sws: move RGB2YUV_SHIFT to swscale_internal.h
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/input.c | 2 | ||||
| -rw-r--r-- | libswscale/swscale.c | 1 | ||||
| -rw-r--r-- | libswscale/swscale_internal.h | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/libswscale/input.c b/libswscale/input.c index b682acd03e..5259603fb4 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -36,8 +36,6 @@ #include "swscale.h" #include "swscale_internal.h" -#define RGB2YUV_SHIFT 15 - #define input_pixel(pos) (isBE(origin) ? AV_RB16(pos) : AV_RL16(pos)) #define r ((origin == AV_PIX_FMT_BGR48BE || origin == AV_PIX_FMT_BGR48LE) ? b_r : r_b) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 0dcd39b74f..d72a8acefd 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -385,7 +385,6 @@ static int swScale(SwsContext *c, const uint8_t *src[], if (!usePal(c->srcFormat)) { pal = c->input_rgb2yuv_table; -#define RGB2YUV_SHIFT 15 pal[BY_IDX] = ((int)(0.114 * 219 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)); pal[BV_IDX] = (-(int)(0.081 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)); pal[BU_IDX] = ((int)(0.500 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)); diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index e801bc92ce..4de94a6247 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -370,6 +370,7 @@ typedef struct SwsContext { #define RV_IDX 6 #define GV_IDX 7 #define BV_IDX 8 +#define RGB2YUV_SHIFT 15 int *dither_error[4]; |