summaryrefslogtreecommitdiff
path: root/libavresample
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-21 14:57:53 -0300
committerJames Almer <jamrial@gmail.com>2017-10-21 14:57:53 -0300
commit69b5ce64d2260b01e28feb81527ad282bfcdf43b (patch)
tree335027df1ff3e8e218f8daf50c86212c363821b4 /libavresample
parent4c0a8ff0610c15cb1ceeca037d6b7c8fd3b2420a (diff)
parent07a2b155949eb267cdfc7805f42c7b3375f9c7c5 (diff)
downloadffmpeg-69b5ce64d2260b01e28feb81527ad282bfcdf43b.tar.gz
Merge commit '07a2b155949eb267cdfc7805f42c7b3375f9c7c5'
* commit '07a2b155949eb267cdfc7805f42c7b3375f9c7c5': Bump major versions of all libraries A few API deprecated ~2 years ago or more are also postponed here for varying reasons. FF_API_LOWRES: Since this functionality depends on AVStream->codec, i figure the two can be removed at the same time in the next bump or so. FF_API_AVCTX_TIMEBASE: Couldn't get this one to work. Not just libavcodec but apparently also libavformat and ffmpeg.c expect AVCodecContext->time_base to be set for decoding. Upon removal some tests report a different generic stream time base (like 1/25), and others lose packet duration values. I guess it's somehow tied to the AVStream->codec clusterfuck. It can be dealt with alongside FF_API_LAVF_AVCTX in the next bump. FF_API_OLD_FILTER_OPTS_ERROR: This one is meant to remain after FF_API_OLD_FILTER_OPTS is removed. Its purpose is displaying the corrected command line using the new syntax as a suggestion as part of the error message. Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavresample')
-rw-r--r--libavresample/version.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavresample/version.h b/libavresample/version.h
index e8f43ee0ff..d5d3ea82b1 100644
--- a/libavresample/version.h
+++ b/libavresample/version.h
@@ -27,8 +27,8 @@
#include "libavutil/version.h"
-#define LIBAVRESAMPLE_VERSION_MAJOR 3
-#define LIBAVRESAMPLE_VERSION_MINOR 8
+#define LIBAVRESAMPLE_VERSION_MAJOR 4
+#define LIBAVRESAMPLE_VERSION_MINOR 0
#define LIBAVRESAMPLE_VERSION_MICRO 0
#define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \