har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'

Browse Source 
* commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e':
  swscale: Undeprecate sws_getContext()

Conflicts:
	libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-07 20:52:40 +02:00
commit 4917fecf4a
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -15,6 +15,9 @@ libavutil: 2012-10-22
API changes, most recent first: API changes, most recent first:
2014-08-xx - xxxxxxx - lsws 2.1.3 - swscale.h
sws_getCachedContext is not going to be removed in the future.
2014-08-xx - xxxxxxx - lavc 55.57.3 - avcodec.h 2014-08-xx - xxxxxxx - lavc 55.57.3 - avcodec.h
reordered_opaque is not going to be removed in the future. reordered_opaque is not going to be removed in the future.

3
libswscale/swscale.h
View File

@ -174,7 +174,6 @@ int sws_init_context(struct SwsContext *sws_context, SwsFilter *srcFilter, SwsFi
*/ */
void sws_freeContext(struct SwsContext *swsContext); void sws_freeContext(struct SwsContext *swsContext);
#if FF_API_SWS_GETCONTEXT
/** /**
* Allocate and return an SwsContext. You need it to perform * Allocate and return an SwsContext. You need it to perform
* scaling/conversion operations using sws_scale(). * scaling/conversion operations using sws_scale().
@ -189,13 +188,11 @@ void sws_freeContext(struct SwsContext *swsContext);
* @return a pointer to an allocated context, or NULL in case of error * @return a pointer to an allocated context, or NULL in case of error
* @note this function is to be removed after a saner alternative is * @note this function is to be removed after a saner alternative is
* written * written
* @deprecated Use sws_getCachedContext() instead.
*/ */
struct SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat, struct SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
int dstW, int dstH, enum AVPixelFormat dstFormat, int dstW, int dstH, enum AVPixelFormat dstFormat,
int flags, SwsFilter *srcFilter, int flags, SwsFilter *srcFilter,
SwsFilter *dstFilter, const double *param); SwsFilter *dstFilter, const double *param);
#endif
/** /**
* Scale the image slice in srcSlice and put the resulting scaled * Scale the image slice in srcSlice and put the resulting scaled

2
libswscale/utils.c
View File

@ -1493,7 +1493,6 @@ fail: // FIXME replace things by appropriate error codes
return -1; return -1;
} }
#if FF_API_SWS_GETCONTEXT
SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat, SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
int dstW, int dstH, enum AVPixelFormat dstFormat, int dstW, int dstH, enum AVPixelFormat dstFormat,
int flags, SwsFilter *srcFilter, int flags, SwsFilter *srcFilter,
@ -1524,7 +1523,6 @@ SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
return c; return c;
} }
#endif
SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur, SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,
float lumaSharpen, float chromaSharpen, float lumaSharpen, float chromaSharpen,

5
libswscale/version.h
View File

@ -28,7 +28,7 @@
#define LIBSWSCALE_VERSION_MAJOR 2 #define LIBSWSCALE_VERSION_MAJOR 2
#define LIBSWSCALE_VERSION_MINOR 6 #define LIBSWSCALE_VERSION_MINOR 6
#define LIBSWSCALE_VERSION_MICRO 100 #define LIBSWSCALE_VERSION_MICRO 101
#define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
LIBSWSCALE_VERSION_MINOR, \ LIBSWSCALE_VERSION_MINOR, \
@ -46,9 +46,6 @@
* the public API and may change, break or disappear at any time. * the public API and may change, break or disappear at any time.
*/ */
#ifndef FF_API_SWS_GETCONTEXT
#define FF_API_SWS_GETCONTEXT (LIBSWSCALE_VERSION_MAJOR < 3)
#endif
#ifndef FF_API_SWS_CPU_CAPS #ifndef FF_API_SWS_CPU_CAPS
#define FF_API_SWS_CPU_CAPS (LIBSWSCALE_VERSION_MAJOR < 3) #define FF_API_SWS_CPU_CAPS (LIBSWSCALE_VERSION_MAJOR < 3)
#endif #endif