summaryrefslogtreecommitdiff
path: root/libavutil/version.h
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-06-22 22:38:49 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2016-06-22 22:38:49 +0200
commit3689efea3d59579291ecafccc3d9cbe720e7bea3 (patch)
tree7bde9ce5ad61c7b9fe7f5bb0e23ea17a0adc90f5 /libavutil/version.h
parentd0b21b28a3d348c0302c98cee23c4820cd13e1e2 (diff)
parentc46db38cde8e8fd8ecb1c6602f10ec0e002f29a8 (diff)
Merge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8'
* commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8': hwcontext: add a dxva2 implementation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil/version.h')
-rw-r--r--libavutil/version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h
index 35b6374f36..588ab5a171 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -64,7 +64,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 55
-#define LIBAVUTIL_VERSION_MINOR 24
+#define LIBAVUTIL_VERSION_MINOR 25
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \