diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-26 01:20:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-26 01:26:24 +0100 |
| commit | 31a1342e7a84235eab725bc11e2a708d293624a3 (patch) | |
| tree | 9b206c418264fd726f68df22751e30713a9515ef /libswscale | |
| parent | 022f8d27dd0a61bfaae729d53d133b17418ea16b (diff) | |
| download | ffmpeg-31a1342e7a84235eab725bc11e2a708d293624a3.tar.gz | |
swscale: remove duplicate code from yesterdays merge.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index afc510a75c..09e2edb933 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1668,34 +1668,6 @@ rgb16_32_wrapper(PIX_FMT_BGR555BE, bgr15be, 0, 0, 0, 0, 0x001F, 0x03E0, 0x7 rgb16_32_wrapper(PIX_FMT_RGB565BE, rgb16be, 0, 0, 0, 0, 0xF800, 0x07E0, 0x001F, 0, 5, 11, RGB2YUV_SHIFT+8); rgb16_32_wrapper(PIX_FMT_RGB555BE, rgb15be, 0, 0, 0, 0, 0x7C00, 0x03E0, 0x001F, 0, 5, 10, RGB2YUV_SHIFT+7); -static void gbr24pToY_c(uint16_t *dst, const uint8_t *gsrc, const uint8_t *bsrc, const uint8_t *rsrc, - int width, uint32_t *unused) -{ - int i; - for (i = 0; i < width; i++) { - unsigned int g = gsrc[i]; - unsigned int b = bsrc[i]; - unsigned int r = rsrc[i]; - - dst[i] = (RY*r + GY*g + BY*b + (0x801<<(RGB2YUV_SHIFT-7))) >> (RGB2YUV_SHIFT-6); - } -} - -static void gbr24pToUV_c(uint16_t *dstU, uint16_t *dstV, - const uint8_t *gsrc, const uint8_t *bsrc, const uint8_t *rsrc, - int width, enum PixelFormat origin) -{ - int i; - for (i = 0; i < width; i++) { - unsigned int g = gsrc[i]; - unsigned int b = bsrc[i]; - unsigned int r = rsrc[i]; - - dstU[i] = (RU*r + GU*g + BU*b + (0x4001<<(RGB2YUV_SHIFT-7))) >> (RGB2YUV_SHIFT-6); - dstV[i] = (RV*r + GV*g + BV*b + (0x4001<<(RGB2YUV_SHIFT-7))) >> (RGB2YUV_SHIFT-6); - } -} - static void gbr24pToUV_half_c(uint16_t *dstU, uint16_t *dstV, const uint8_t *gsrc, const uint8_t *bsrc, const uint8_t *rsrc, int width, enum PixelFormat origin) @@ -2966,7 +2938,6 @@ static av_cold void sws_init_swScale_c(SwsContext *c) case PIX_FMT_RGB565BE: c->chrToYV12 = rgb16beToUV_c; break; case PIX_FMT_RGB555LE: c->chrToYV12 = rgb15leToUV_c; break; case PIX_FMT_RGB555BE: c->chrToYV12 = rgb15beToUV_c; break; -// case PIX_FMT_GBR24P : c->chrToYV12 = gbr24pToUV_c; break; } } @@ -3031,7 +3002,6 @@ static av_cold void sws_init_swScale_c(SwsContext *c) case PIX_FMT_RGB48LE: c->lumToYV12 = rgb48LEToY_c; break; case PIX_FMT_BGR48BE: c->lumToYV12 = bgr48BEToY_c; break; case PIX_FMT_BGR48LE: c->lumToYV12 = bgr48LEToY_c; break; -// case PIX_FMT_GBR24P : c->lumToYV12 = gbr24pToY_c ; break; } if (c->alpPixBuf) { switch (srcFormat) { |