diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 22:19:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 22:19:45 +0200 |
| commit | 3e41d2e612215e2ee9f436e3ad3bd8440b6ddfb4 (patch) | |
| tree | 4f0c33c423c6ef6929256e946b5bfd23cf251a11 /libswscale | |
| parent | 499ff6a052591d980ed36e10ac2019cef14c302b (diff) | |
| parent | f4c444e17d137c786f0ed2da0e5943df505d5f9e (diff) | |
| download | ffmpeg-3e41d2e612215e2ee9f436e3ad3bd8440b6ddfb4.tar.gz | |
Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'
* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e':
Postpone API-incompatible changes until the next bump.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/version.h b/libswscale/version.h index 09da9102de..8bd29ac37a 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -47,13 +47,13 @@ */ #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 < 4) #endif #ifndef FF_API_SWS_FORMAT_NAME #define FF_API_SWS_FORMAT_NAME (LIBSWSCALE_VERSION_MAJOR < 3) #endif #ifndef FF_API_ARCH_BFIN -#define FF_API_ARCH_BFIN (LIBSWSCALE_VERSION_MAJOR < 3) +#define FF_API_ARCH_BFIN (LIBSWSCALE_VERSION_MAJOR < 4) #endif #endif /* SWSCALE_VERSION_H */ |