History

swscale: Undeprecate sws_getContext()

sws_getCachedContext is not a full replacement for the function.

Diego Biurrun committed 12 years ago

Commit bb789011 parent ad1ee5f4 files · +4 −9Browse files

Unified · Split

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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t