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
1313
1414 API changes, most recent first:
1515
16+2014-08-xx - xxxxxxx - lsws 2.1.3 - swscale.h
17+ sws_getCachedContext is not going to be removed in the future.
18+
1619 2014-08-xx - xxxxxxx - lavc 55.57.3 - avcodec.h
1720 reordered_opaque is not going to be removed in the future.
1821
libswscale/swscale.h+0−3
@@ -174,7 +174,6 @@ int sws_init_context(struct SwsContext *sws_context, SwsFilter *srcFilter, SwsFi · 173 unmodified lines
174174 */
175175 void sws_freeContext(struct SwsContext *swsContext);
176176
177−#if FF_API_SWS_GETCONTEXT
178177 /**
179178 * Allocate and return an SwsContext. You need it to perform
180179 * scaling/conversion operations using sws_scale().
@@ -189,13 +188,11 @@ void sws_freeContext(struct SwsContext *swsContext); · 8 unmodified lines
189188 * @return a pointer to an allocated context, or NULL in case of error
190189 * @note this function is to be removed after a saner alternative is
191190 * written
192− * @deprecated Use sws_getCachedContext() instead.
193191 */
194192 struct SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
195193 int dstW, int dstH, enum AVPixelFormat dstFormat,
196194 int flags, SwsFilter *srcFilter,
197195 SwsFilter *dstFilter, const double *param);
198−#endif
199196
200197 /**
201198 * 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
13181318 return -1;
13191319 }
13201320
1321−#if FF_API_SWS_GETCONTEXT
13221321 SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
13231322 int dstW, int dstH, enum AVPixelFormat dstFormat,
13241323 int flags, SwsFilter *srcFilter,
@@ -1354,7 +1353,6 @@ SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat, · 29 unmodified lines
13541353
13551354 return c;
13561355 }
1357−#endif
13581356
13591357 SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,
13601358 float lumaSharpen, float chromaSharpen,
libswscale/version.h+1−4
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828
2929 #define LIBSWSCALE_VERSION_MAJOR 2
3030 #define LIBSWSCALE_VERSION_MINOR 1
31−#define LIBSWSCALE_VERSION_MICRO 2
31+#define LIBSWSCALE_VERSION_MICRO 3
3232
3333 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
3434 LIBSWSCALE_VERSION_MINOR, \
@@ -46,9 +46,6 @@ · 11 unmodified lines
4646 * the public API and may change, break or disappear at any time.
4747 */
4848
49−#ifndef FF_API_SWS_GETCONTEXT
50−#define FF_API_SWS_GETCONTEXT (LIBSWSCALE_VERSION_MAJOR < 3)
51−#endif
5249 #ifndef FF_API_SWS_CPU_CAPS
5350 #define FF_API_SWS_CPU_CAPS (LIBSWSCALE_VERSION_MAJOR < 3)
5451 #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