diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2010-06-01 06:53:56 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2010-06-01 06:53:56 +0000 |
| commit | 3d9408f4a7129ba6fb06f838afa5663c5c73075d (patch) | |
| tree | dbc10e4c611980c9b30b110fa34baebed03077cb | |
| parent | 770e50ae80d399ca2e9c397e03abfa71df8b11f3 (diff) | |
remove palette8torgb15 and palette8tobgr15
They contain exactly the same code as their 16bit variants, so this is
effectively code de-duplication.
Originally committed as revision 31298 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
| -rw-r--r-- | libswscale/rgb2rgb.c | 16 | ||||
| -rw-r--r-- | libswscale/rgb2rgb.h | 2 |
2 files changed, 0 insertions, 18 deletions
diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index 7d1cefca3a..9080ead463 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -250,22 +250,6 @@ void palette8tobgr16(const uint8_t *src, uint8_t *dst, long num_pixels, const ui ((uint16_t *)dst)[i] = bswap_16(((const uint16_t *)palette)[src[i]]); } -/** - * Palette is assumed to contain BGR15, see rgb32to15 to convert the palette. - */ -void palette8torgb15(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette) -{ - long i; - for (i=0; i<num_pixels; i++) - ((uint16_t *)dst)[i] = ((const uint16_t *)palette)[src[i]]; -} -void palette8tobgr15(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette) -{ - long i; - for (i=0; i<num_pixels; i++) - ((uint16_t *)dst)[i] = bswap_16(((const uint16_t *)palette)[src[i]]); -} - void rgb32to24(const uint8_t *src, uint8_t *dst, long src_size) { long i; diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h index 386068b856..1d9f761785 100644 --- a/libswscale/rgb2rgb.h +++ b/libswscale/rgb2rgb.h @@ -70,8 +70,6 @@ void palette8topacked32(const uint8_t *src, uint8_t *dst, long num_pixels, const void palette8topacked24(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette); void palette8torgb16(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette); void palette8tobgr16(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette); -void palette8torgb15(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette); -void palette8tobgr15(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette); /** * Height should be a multiple of 2 and width should be a multiple of 16. |