summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2015-03-25 03:58:13 -0300
committerJames Almer <jamrial@gmail.com>2015-03-25 03:59:34 -0300
commit23e1303c0add5127ee0a59226ad8078bbe48fe49 (patch)
tree31724553bd6f386f79647430f9581eb034ce55de
parent7c4910758ac2c47b8016e9334f78637aa800d967 (diff)
downloadffmpeg-23e1303c0add5127ee0a59226ad8078bbe48fe49.tar.gz
avcodec/nvenc_h265: add missing version bump and changelog entry
Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--Changelog1
-rw-r--r--libavcodec/version.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index 567bd7488b..b0d041462c 100644
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,7 @@ version <next>:
- showwavespic filter
- libdcadec wrapper
- Drop support for nvenc API before 5.0
+- nvenc H265 encoder
version 2.6:
diff --git a/libavcodec/version.h b/libavcodec/version.h
index d2950ecda3..e56dc706d8 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,8 +29,8 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 56
-#define LIBAVCODEC_VERSION_MINOR 29
-#define LIBAVCODEC_VERSION_MICRO 101
+#define LIBAVCODEC_VERSION_MINOR 30
+#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \