diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-10 23:12:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-10 23:12:24 +0100 |
| commit | a9bd29e15e8d4ab4afaba7c31ebc0063c1df2db9 (patch) | |
| tree | 6d7838b72e6ae2b4e390e278988b9a20d8aa2247 /libswscale/rgb2rgb.h | |
| parent | f4a01d7788449b08a3bd0569951860602bcd9eb5 (diff) | |
| parent | 296a338261ebcfaf7b961a6d1e6a3adb4da69a61 (diff) | |
| download | ffmpeg-a9bd29e15e8d4ab4afaba7c31ebc0063c1df2db9.tar.gz | |
Merge remote-tracking branch 'richardpl/sws'
* richardpl/sws:
rgb2rgb: remove unused bgr8torgb8()
rgb2rgb: rgb12tobgr12()
rgb2rgb: allow conversion for <15 bpp
bmpenc: support for PIX_FMT_RGB444
bmpdec: support for rgb444 with bitfields compression
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/rgb2rgb.h')
| -rw-r--r-- | libswscale/rgb2rgb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h index a7542cb211..4e63124977 100644 --- a/libswscale/rgb2rgb.h +++ b/libswscale/rgb2rgb.h @@ -62,7 +62,7 @@ void rgb15tobgr32(const uint8_t *src, uint8_t *dst, int src_size); void rgb15to24(const uint8_t *src, uint8_t *dst, int src_size); void rgb15tobgr16(const uint8_t *src, uint8_t *dst, int src_size); void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int src_size); -void bgr8torgb8(const uint8_t *src, uint8_t *dst, int src_size); +void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size); void shuffle_bytes_0321(const uint8_t *src, uint8_t *dst, int src_size); void shuffle_bytes_1230(const uint8_t *src, uint8_t *dst, int src_size); |