Browse Source

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
tags/n0.8
Reinhard Tartler 15 years ago
parent
commit
3d9408f4a7
2 changed files with 0 additions and 18 deletions
  1. +0
    -16
      libswscale/rgb2rgb.c
  2. +0
    -2
      libswscale/rgb2rgb.h

+ 0
- 16
libswscale/rgb2rgb.c View File

@@ -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;


+ 0
- 2
libswscale/rgb2rgb.h View File

@@ -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.


Loading…
Cancel
Save