virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

sws: remove disabled cruft.

Browse Source
This commit is contained in:
Anton Khirnov 2011-04-19 21:25:10 +02:00
parent 975c273405
commit 7dfe244fbd
5 changed files with 0 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libswscale/rgb2rgb.c
View File

@ -124,34 +124,6 @@ void sws_rgb2rgb_init(int flags)
#endif /* HAVE_MMX2 || HAVE_AMD3DNOW || HAVE_MMX */ #endif /* HAVE_MMX2 || HAVE_AMD3DNOW || HAVE_MMX */
} }
#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, long src_size) void rgb32to24(const uint8_t *src, uint8_t *dst, long src_size)
{ {
long i; long i;

10
libswscale/rgb2rgb.h
View File

@ -68,16 +68,6 @@ void shuffle_bytes_1230(const uint8_t *src, uint8_t *dst, long src_size);
void shuffle_bytes_3012(const uint8_t *src, uint8_t *dst, long src_size); void shuffle_bytes_3012(const uint8_t *src, uint8_t *dst, long src_size);
void shuffle_bytes_3210(const uint8_t *src, uint8_t *dst, long src_size); void shuffle_bytes_3210(const uint8_t *src, uint8_t *dst, long 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
/** /**
* Height should be a multiple of 2 and width should be a multiple of 16. * Height should be a multiple of 2 and width should be a multiple of 16.
* (If this is a problem for anyone then tell me, and I will fix it.) * (If this is a problem for anyone then tell me, and I will fix it.)

8
libswscale/swscale.c
View File

@ -1952,14 +1952,6 @@ int sws_scale(SwsContext *c, const uint8_t* const src[], const int srcStride[],
} }
} }
#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, long num_pixels, const uint8_t *palette) void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette)
{ {

16
libswscale/swscale.h
View File

@ -223,15 +223,6 @@ struct SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat
int sws_scale(struct SwsContext *context, const uint8_t* const srcSlice[], const int srcStride[], int sws_scale(struct SwsContext *context, const uint8_t* const srcSlice[], const int srcStride[],
int srcSliceY, int srcSliceH, uint8_t* const dst[], const int dstStride[]); int srcSliceY, int srcSliceH, 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]
* @param fullRange if 1 then the luma range is 0..255 if 0 it is 16..235 * @param fullRange if 1 then the luma range is 0..255 if 0 it is 16..235
@ -291,13 +282,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.

7
libswscale/utils.c
View File

@ -1440,13 +1440,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;