mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-11 20:35:18 +00:00
Drop the deprecated sws_scale_ordered() at the next major version
bump. Originally committed as revision 28492 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
parent
96b27045d2
commit
c099766fad
@ -2820,6 +2820,7 @@ int sws_scale(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
|
||||
}
|
||||
}
|
||||
|
||||
#if LIBSWSCALE_VERSION_MAJOR < 1
|
||||
/**
|
||||
* swscale wrapper, so we don't need to export the SwsContext.
|
||||
*/
|
||||
@ -2827,6 +2828,7 @@ int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli
|
||||
int srcSliceH, uint8_t* dst[], int dstStride[]){
|
||||
return sws_scale(c, src, srcStride, srcSliceY, srcSliceH, dst, dstStride);
|
||||
}
|
||||
#endif
|
||||
|
||||
SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,
|
||||
float lumaSharpen, float chromaSharpen,
|
||||
|
@ -118,8 +118,10 @@ struct SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat
|
||||
SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
|
||||
int sws_scale(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY,
|
||||
int srcSliceH, uint8_t* dst[], int dstStride[]);
|
||||
#if LIBSWSCALE_VERSION_MAJOR < 1
|
||||
int sws_scale_ordered(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY,
|
||||
int srcSliceH, uint8_t* dst[], int dstStride[]) attribute_deprecated;
|
||||
#endif
|
||||
|
||||
|
||||
int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], int srcRange, const int table[4], int dstRange, int brightness, int contrast, int saturation);
|
||||
|
Loading…
Reference in New Issue
Block a user