aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-10 00:53:27 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-10 01:17:02 +0200
commit97f8c7a03eddacd9b6450423cc21a801e002f01f (patch)
treeb0a3bbc9c884bab2118fb802a93e6792fffb04c2
parent74be0f82a775fdf93d4a41c4e3049679ef93b6d3 (diff)
downloadffmpeg-97f8c7a03eddacd9b6450423cc21a801e002f01f.tar.gz
bump libpostproc and libswresample
this is needed / avoids some headaches as one of their dependancies (libavutil) was bumped Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/APIchanges4
-rw-r--r--libpostproc/version.h4
-rw-r--r--libswresample/swresample_internal.h2
-rw-r--r--libswresample/version.h4
4 files changed, 8 insertions, 6 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index 4030428e0e..4d4ac3f757 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -7,8 +7,8 @@ libavdevice: 2014-08-09
libavfilter: 2014-08-09
libavformat: 2014-08-09
libavresample: 2014-08-09
-libpostproc: 2011-04-18
-libswresample: 2011-09-19
+libpostproc: 2014-08-09
+libswresample: 2014-08-09
libswscale: 2014-08-09
libavutil: 2014-08-09
diff --git a/libpostproc/version.h b/libpostproc/version.h
index 111db44e01..dab1965a10 100644
--- a/libpostproc/version.h
+++ b/libpostproc/version.h
@@ -28,8 +28,8 @@
#include "libavutil/avutil.h"
-#define LIBPOSTPROC_VERSION_MAJOR 52
-#define LIBPOSTPROC_VERSION_MINOR 3
+#define LIBPOSTPROC_VERSION_MAJOR 53
+#define LIBPOSTPROC_VERSION_MINOR 0
#define LIBPOSTPROC_VERSION_MICRO 100
#define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h
index be4b321f70..792768afbf 100644
--- a/libswresample/swresample_internal.h
+++ b/libswresample/swresample_internal.h
@@ -25,6 +25,8 @@
#include "libavutil/channel_layout.h"
#include "config.h"
+#define SWR_CH_MAX 32
+
#define SQRT3_2 1.22474487139158904909 /* sqrt(3/2) */
#define NS_TAPS 20
diff --git a/libswresample/version.h b/libswresample/version.h
index 8ca9f59102..316d304e48 100644
--- a/libswresample/version.h
+++ b/libswresample/version.h
@@ -28,8 +28,8 @@
#include "libavutil/avutil.h"
-#define LIBSWRESAMPLE_VERSION_MAJOR 0
-#define LIBSWRESAMPLE_VERSION_MINOR 19
+#define LIBSWRESAMPLE_VERSION_MAJOR 1
+#define LIBSWRESAMPLE_VERSION_MINOR 0
#define LIBSWRESAMPLE_VERSION_MICRO 100
#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \