sws_getCachedContext is not a full replacement for the function.
Unified · Split
| @@ -13,6 +13,9 @@ libavutil: 2013-12-xx · 12 unmodified lines | ||
| 13 | 13 | |
| 14 | 14 | API changes, most recent first: |
| 15 | 15 | |
| 16 | +2014-08-xx - xxxxxxx - lsws 2.1.3 - swscale.h | |
| 17 | + sws_getCachedContext is not going to be removed in the future. | |
| 18 | + | |
| 16 | 19 | 2014-08-xx - xxxxxxx - lavc 55.57.3 - avcodec.h |
| 17 | 20 | reordered_opaque is not going to be removed in the future. |
| 18 | 21 | |
| @@ -174,7 +174,6 @@ int sws_init_context(struct SwsContext *sws_context, SwsFilter *srcFilter, SwsFi · 173 unmodified lines | ||
| 174 | 174 | */ |
| 175 | 175 | void sws_freeContext(struct SwsContext *swsContext); |
| 176 | 176 | |
| 177 | −#if FF_API_SWS_GETCONTEXT | |
| 178 | 177 | /** |
| 179 | 178 | * Allocate and return an SwsContext. You need it to perform |
| 180 | 179 | * scaling/conversion operations using sws_scale(). |
| @@ -189,13 +188,11 @@ void sws_freeContext(struct SwsContext *swsContext); · 8 unmodified lines | ||
| 189 | 188 | * @return a pointer to an allocated context, or NULL in case of error |
| 190 | 189 | * @note this function is to be removed after a saner alternative is |
| 191 | 190 | * written |
| 192 | − * @deprecated Use sws_getCachedContext() instead. | |
| 193 | 191 | */ |
| 194 | 192 | struct SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat, |
| 195 | 193 | int dstW, int dstH, enum AVPixelFormat dstFormat, |
| 196 | 194 | int flags, SwsFilter *srcFilter, |
| 197 | 195 | SwsFilter *dstFilter, const double *param); |
| 198 | −#endif | |
| 199 | 196 | |
| 200 | 197 | /** |
| 201 | 198 | * Scale the image slice in srcSlice and put the resulting scaled |
| @@ -1318,7 +1318,6 @@ fail: // FIXME replace things by appropriate error codes · 1317 unmodified lines | ||
| 1318 | 1318 | return -1; |
| 1319 | 1319 | } |
| 1320 | 1320 | |
| 1321 | −#if FF_API_SWS_GETCONTEXT | |
| 1322 | 1321 | SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat, |
| 1323 | 1322 | int dstW, int dstH, enum AVPixelFormat dstFormat, |
| 1324 | 1323 | int flags, SwsFilter *srcFilter, |
| @@ -1354,7 +1353,6 @@ SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat, · 29 unmodified lines | ||
| 1354 | 1353 | |
| 1355 | 1354 | return c; |
| 1356 | 1355 | } |
| 1357 | −#endif | |
| 1358 | 1356 | |
| 1359 | 1357 | SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur, |
| 1360 | 1358 | float lumaSharpen, float chromaSharpen, |
| @@ -28,7 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | |
| 29 | 29 | #define LIBSWSCALE_VERSION_MAJOR 2 |
| 30 | 30 | #define LIBSWSCALE_VERSION_MINOR 1 |
| 31 | −#define LIBSWSCALE_VERSION_MICRO 2 | |
| 31 | +#define LIBSWSCALE_VERSION_MICRO 3 | |
| 32 | 32 | |
| 33 | 33 | #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ |
| 34 | 34 | LIBSWSCALE_VERSION_MINOR, \ |
| @@ -46,9 +46,6 @@ · 11 unmodified lines | ||
| 46 | 46 | * the public API and may change, break or disappear at any time. |
| 47 | 47 | */ |
| 48 | 48 | |
| 49 | −#ifndef FF_API_SWS_GETCONTEXT | |
| 50 | −#define FF_API_SWS_GETCONTEXT (LIBSWSCALE_VERSION_MAJOR < 3) | |
| 51 | −#endif | |
| 52 | 49 | #ifndef FF_API_SWS_CPU_CAPS |
| 53 | 50 | #define FF_API_SWS_CPU_CAPS (LIBSWSCALE_VERSION_MAJOR < 3) |
| 54 | 51 | #endif |