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/utils.c | |
| 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/utils.c')
| -rw-r--r-- | libswscale/utils.c | 2 |
1 files changed, 0 insertions, 2 deletions
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, |