Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
bb789016
Commit
bb789016
authored
Aug 04, 2014
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swscale: Undeprecate sws_getContext()
sws_getCachedContext is not a full replacement for the function.
parent
ad1ee5fa
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
9 deletions
+4
-9
APIchanges
doc/APIchanges
+3
-0
swscale.h
libswscale/swscale.h
+0
-3
utils.c
libswscale/utils.c
+0
-2
version.h
libswscale/version.h
+1
-4
No files found.
doc/APIchanges
View file @
bb789016
...
@@ -13,6 +13,9 @@ libavutil: 2013-12-xx
...
@@ -13,6 +13,9 @@ libavutil: 2013-12-xx
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.
...
...
libswscale/swscale.h
View file @
bb789016
...
@@ -174,7 +174,6 @@ int sws_init_context(struct SwsContext *sws_context, SwsFilter *srcFilter, SwsFi
...
@@ -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);
...
@@ -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
...
...
libswscale/utils.c
View file @
bb789016
...
@@ -1318,7 +1318,6 @@ fail: // FIXME replace things by appropriate error codes
...
@@ -1318,7 +1318,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
,
...
@@ -1354,7 +1353,6 @@ SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
...
@@ -1354,7 +1353,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
,
...
...
libswscale/version.h
View file @
bb789016
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
#define LIBSWSCALE_VERSION_MAJOR 2
#define LIBSWSCALE_VERSION_MAJOR 2
#define LIBSWSCALE_VERSION_MINOR 1
#define LIBSWSCALE_VERSION_MINOR 1
#define LIBSWSCALE_VERSION_MICRO
2
#define LIBSWSCALE_VERSION_MICRO
3
#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 @@
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment