diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 00:26:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 00:26:45 +0200 |
| commit | a57ece0cb48ba131a2d6ba9d4525d9195238f18c (patch) | |
| tree | f8cf30fc37742977986cef12f616ebd15869c9d0 /libswscale | |
| parent | 80c1cb522c9779c3e799fbe2fc5e19a53bfd079f (diff) | |
| parent | 1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8 (diff) | |
| download | ffmpeg-a57ece0cb48ba131a2d6ba9d4525d9195238f18c.tar.gz | |
Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
Bump major versions of all libraries.
Conflicts:
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
libavutil/version.h
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/version.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/version.h b/libswscale/version.h index 8bd29ac37a..b764883819 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -26,9 +26,9 @@ #include "libavutil/version.h" -#define LIBSWSCALE_VERSION_MAJOR 2 -#define LIBSWSCALE_VERSION_MINOR 6 -#define LIBSWSCALE_VERSION_MICRO 101 +#define LIBSWSCALE_VERSION_MAJOR 3 +#define LIBSWSCALE_VERSION_MINOR 0 +#define LIBSWSCALE_VERSION_MICRO 100 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \ |