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/version.h | |
| 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/version.h')
| -rw-r--r-- | libswscale/version.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libswscale/version.h b/libswscale/version.h index c0d4f8ab0f..09da9102de 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -28,7 +28,7 @@ #define LIBSWSCALE_VERSION_MAJOR 2 #define LIBSWSCALE_VERSION_MINOR 6 -#define LIBSWSCALE_VERSION_MICRO 100 +#define LIBSWSCALE_VERSION_MICRO 101 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \ @@ -46,9 +46,6 @@ * 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 #define FF_API_SWS_CPU_CAPS (LIBSWSCALE_VERSION_MAJOR < 3) #endif |