diff options
| -rw-r--r-- | libmpcodecs/vf_palette.c | 10 | ||||
| -rw-r--r-- | libswscale/rgb2rgb.c | 16 | ||||
| -rw-r--r-- | libswscale/rgb2rgb.h | 2 |
3 files changed, 0 insertions, 28 deletions
diff --git a/libmpcodecs/vf_palette.c b/libmpcodecs/vf_palette.c index cef47df788..44a4756121 100644 --- a/libmpcodecs/vf_palette.c +++ b/libmpcodecs/vf_palette.c @@ -114,11 +114,6 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ // no stride conversion needed switch(IMGFMT_RGB_DEPTH(dmpi->imgfmt)){ case 15: - if (IMGFMT_IS_BGR(dmpi->imgfmt)) - palette8tobgr15(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); - else - palette8torgb15(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); - break; case 16: if (IMGFMT_IS_BGR(dmpi->imgfmt)) palette8tobgr16(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); @@ -145,11 +140,6 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ unsigned char* dst=dmpi->planes[0]+y*dmpi->stride[0]; switch(IMGFMT_RGB_DEPTH(dmpi->imgfmt)){ case 15: - if (IMGFMT_IS_BGR(dmpi->imgfmt)) - palette8tobgr15(src,dst,mpi->w,mpi->planes[1]); - else - palette8torgb15(src,dst,mpi->w,mpi->planes[1]); - break; case 16: if (IMGFMT_IS_BGR(dmpi->imgfmt)) palette8tobgr16(src,dst,mpi->w,mpi->planes[1]); 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. |