| @@ -123,34 +123,6 @@ void sws_rgb2rgb_init(void) | |||||
| rgb2rgb_init_x86(); | rgb2rgb_init_x86(); | ||||
| } | } | ||||
| #if LIBSWSCALE_VERSION_MAJOR < 1 | |||||
| void palette8topacked32(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette) | |||||
| { | |||||
| sws_convertPalette8ToPacked32(src, dst, num_pixels, palette); | |||||
| } | |||||
| void palette8topacked24(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette) | |||||
| { | |||||
| sws_convertPalette8ToPacked24(src, dst, num_pixels, palette); | |||||
| } | |||||
| /** | |||||
| * Palette is assumed to contain BGR16, see rgb32to16 to convert the palette. | |||||
| */ | |||||
| void palette8torgb16(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 palette8tobgr16(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] = av_bswap16(((const uint16_t *)palette)[src[i]]); | |||||
| } | |||||
| #endif | |||||
| void rgb32to24(const uint8_t *src, uint8_t *dst, int src_size) | void rgb32to24(const uint8_t *src, uint8_t *dst, int src_size) | ||||
| { | { | ||||
| int i; | int i; | ||||
| @@ -68,17 +68,6 @@ void shuffle_bytes_1230(const uint8_t *src, uint8_t *dst, int src_size); | |||||
| void shuffle_bytes_3012(const uint8_t *src, uint8_t *dst, int src_size); | void shuffle_bytes_3012(const uint8_t *src, uint8_t *dst, int src_size); | ||||
| void shuffle_bytes_3210(const uint8_t *src, uint8_t *dst, int src_size); | void shuffle_bytes_3210(const uint8_t *src, uint8_t *dst, int src_size); | ||||
| #if LIBSWSCALE_VERSION_MAJOR < 1 | |||||
| /* deprecated, use the public versions in swscale.h */ | |||||
| attribute_deprecated void palette8topacked32(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette); | |||||
| attribute_deprecated void palette8topacked24(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette); | |||||
| /* totally deprecated, please fix code that uses this */ | |||||
| attribute_deprecated void palette8torgb16(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette); | |||||
| attribute_deprecated void palette8tobgr16(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette); | |||||
| #endif | |||||
| void rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, | void rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, | ||||
| uint8_t *vdst, int width, int height, int lumStride, | uint8_t *vdst, int width, int height, int lumStride, | ||||
| int chromStride, int srcStride); | int chromStride, int srcStride); | ||||
| @@ -239,15 +239,6 @@ int sws_scale(struct SwsContext *c, const uint8_t* const srcSlice[], | |||||
| const int srcStride[], int srcSliceY, int srcSliceH, | const int srcStride[], int srcSliceY, int srcSliceH, | ||||
| uint8_t* const dst[], const int dstStride[]); | uint8_t* const dst[], const int dstStride[]); | ||||
| #if LIBSWSCALE_VERSION_MAJOR < 1 | |||||
| /** | |||||
| * @deprecated Use sws_scale() instead. | |||||
| */ | |||||
| int sws_scale_ordered(struct SwsContext *context, const uint8_t* const src[], | |||||
| int srcStride[], int srcSliceY, int srcSliceH, | |||||
| uint8_t* dst[], int dstStride[]) attribute_deprecated; | |||||
| #endif | |||||
| /** | /** | ||||
| * @param inv_table the yuv2rgb coefficients, normally ff_yuv2rgb_coeffs[x] | * @param inv_table the yuv2rgb coefficients, normally ff_yuv2rgb_coeffs[x] | ||||
| * @return -1 if not supported | * @return -1 if not supported | ||||
| @@ -306,13 +297,6 @@ void sws_shiftVec(SwsVector *a, int shift); | |||||
| */ | */ | ||||
| SwsVector *sws_cloneVec(SwsVector *a); | SwsVector *sws_cloneVec(SwsVector *a); | ||||
| #if LIBSWSCALE_VERSION_MAJOR < 1 | |||||
| /** | |||||
| * @deprecated Use sws_printVec2() instead. | |||||
| */ | |||||
| attribute_deprecated void sws_printVec(SwsVector *a); | |||||
| #endif | |||||
| /** | /** | ||||
| * Prints with av_log() a textual representation of the vector a | * Prints with av_log() a textual representation of the vector a | ||||
| * if log_level <= av_log_level. | * if log_level <= av_log_level. | ||||
| @@ -818,14 +818,6 @@ int sws_scale(struct SwsContext *c, const uint8_t* const srcSlice[], | |||||
| } | } | ||||
| } | } | ||||
| #if LIBSWSCALE_VERSION_MAJOR < 1 | |||||
| int sws_scale_ordered(SwsContext *c, const uint8_t* const src[], int srcStride[], int srcSliceY, | |||||
| int srcSliceH, uint8_t* dst[], int dstStride[]) | |||||
| { | |||||
| return sws_scale(c, src, srcStride, srcSliceY, srcSliceH, dst, dstStride); | |||||
| } | |||||
| #endif | |||||
| /* Convert the palette to the same packed 32-bit format as the palette */ | /* Convert the palette to the same packed 32-bit format as the palette */ | ||||
| void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette) | void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette) | ||||
| { | { | ||||
| @@ -1432,13 +1432,6 @@ void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level) | |||||
| } | } | ||||
| } | } | ||||
| #if LIBSWSCALE_VERSION_MAJOR < 1 | |||||
| void sws_printVec(SwsVector *a) | |||||
| { | |||||
| sws_printVec2(a, NULL, AV_LOG_DEBUG); | |||||
| } | |||||
| #endif | |||||
| void sws_freeVec(SwsVector *a) | void sws_freeVec(SwsVector *a) | ||||
| { | { | ||||
| if (!a) return; | if (!a) return; | ||||