diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 20:52:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 20:52:40 +0200 |
| commit | 4917fecf4a005918d4f32b95683f392f0fae0b51 (patch) | |
| tree | ab2c05a687113f409b7c655fa7b9670d37b8d1eb /libswscale | |
| parent | a561662fb7223cb98907744e03398848a0d362e1 (diff) | |
| parent | bb789016d423d2cfacd2904ac66257bdf7f0964e (diff) | |
| download | ffmpeg-4917fecf4a005918d4f32b95683f392f0fae0b51.tar.gz | |
Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'
* commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e':
swscale: Undeprecate sws_getContext()
Conflicts:
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale.h | 3 | ||||
| -rw-r--r-- | libswscale/utils.c | 2 | ||||
| -rw-r--r-- | libswscale/version.h | 5 |
3 files changed, 1 insertions, 9 deletions
diff --git a/libswscale/swscale.h b/libswscale/swscale.h index e6bb1a84dc..903e1203fd 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -174,7 +174,6 @@ int sws_init_context(struct SwsContext *sws_context, SwsFilter *srcFilter, SwsFi */ void sws_freeContext(struct SwsContext *swsContext); -#if FF_API_SWS_GETCONTEXT /** * Allocate and return an SwsContext. You need it to perform * 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 * @note this function is to be removed after a saner alternative is * written - * @deprecated Use sws_getCachedContext() instead. */ struct SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat, int dstW, int dstH, enum AVPixelFormat dstFormat, int flags, SwsFilter *srcFilter, SwsFilter *dstFilter, const double *param); -#endif /** * Scale the image slice in srcSlice and put the resulting scaled diff --git a/libswscale/utils.c b/libswscale/utils.c index 4f3ce27878..06fd358d94 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1493,7 +1493,6 @@ fail: // FIXME replace things by appropriate error codes return -1; } -#if FF_API_SWS_GETCONTEXT SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat, int dstW, int dstH, enum AVPixelFormat dstFormat, int flags, SwsFilter *srcFilter, @@ -1524,7 +1523,6 @@ SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat, return c; } -#endif SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur, float lumaSharpen, float chromaSharpen, diff --git a/libswscale/version.h b/libswscale/version.h index c0d4f8ab0f..09da9102de 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -28,7 +28,7 @@ #define LIBSWSCALE_VERSION_MAJOR 2 #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, \ LIBSWSCALE_VERSION_MINOR, \ @@ -46,9 +46,6 @@ * 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 #define FF_API_SWS_CPU_CAPS (LIBSWSCALE_VERSION_MAJOR < 3) #endif |