diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 02:26:45 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 02:26:45 +0400 |
| commit | a57ece0cb48ba131a2d6ba9d4525d9195238f18c (patch) | |
| tree | f8cf30fc37742977986cef12f616ebd15869c9d0 /libavresample/version.h | |
| parent | 80c1cb522c9779c3e799fbe2fc5e19a53bfd079f (diff) | |
| parent | 1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8 (diff) | |
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 'libavresample/version.h')
| -rw-r--r-- | libavresample/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavresample/version.h b/libavresample/version.h index 8f6ad2a79e..621d330bcd 100644 --- a/libavresample/version.h +++ b/libavresample/version.h @@ -27,8 +27,8 @@ #include "libavutil/version.h" -#define LIBAVRESAMPLE_VERSION_MAJOR 1 -#define LIBAVRESAMPLE_VERSION_MINOR 3 +#define LIBAVRESAMPLE_VERSION_MAJOR 2 +#define LIBAVRESAMPLE_VERSION_MINOR 0 #define LIBAVRESAMPLE_VERSION_MICRO 0 #define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \ |