[FFmpeg-cvslog] r31298 - in trunk: libmpcodecs/vf_palette.c libswscale/rgb2rgb.c libswscale/rgb2rgb.h

[siretart]

Author: siretart
Date: Tue Jun  1 08:53:56 2010
New Revision: 31298

Log:
remove palette8torgb15 and palette8tobgr15

They contain exactly the same code as their 16bit variants, so this is
effectively code de-duplication.

Modified:
   trunk/libswscale/rgb2rgb.c
   trunk/libswscale/rgb2rgb.h

Changes in other areas also in this revision:
Modified:
   trunk/libmpcodecs/vf_palette.c

Modified: trunk/libswscale/rgb2rgb.c
==============================================================================
--- trunk/libswscale/rgb2rgb.c	Mon May 31 23:24:00 2010	(r31297)
+++ trunk/libswscale/rgb2rgb.c	Tue Jun  1 08:53:56 2010	(r31298)
@@ -250,22 +250,6 @@ void palette8tobgr16(const uint8_t *src,
         ((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;

Modified: trunk/libswscale/rgb2rgb.h
==============================================================================
--- trunk/libswscale/rgb2rgb.h	Mon May 31 23:24:00 2010	(r31297)
+++ trunk/libswscale/rgb2rgb.h	Tue Jun  1 08:53:56 2010	(r31298)
@@ -70,8 +70,6 @@ void palette8topacked32(const uint8_t *s
 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.