Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-10 02:53:27 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-08-10 03:17:02 +0400
commit97f8c7a03eddacd9b6450423cc21a801e002f01f (patch)
treeb0a3bbc9c884bab2118fb802a93e6792fffb04c2 /libswresample
parent74be0f82a775fdf93d4a41c4e3049679ef93b6d3 (diff)
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>
Diffstat (limited to 'libswresample')
-rw-r--r--libswresample/swresample_internal.h2
-rw-r--r--libswresample/version.h4
2 files changed, 4 insertions, 2 deletions
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, \