aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-23 17:46:48 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-23 17:46:48 +0200
commite7873dfccad595e9d8fc65217ebffcf3686e1d34 (patch)
tree29590b5869647d88b67a2c43bfc57e4d514c6c1b
parent9790ed63fcd2cea3704b155ecd040a85527e84aa (diff)
downloadffmpeg-e7873dfccad595e9d8fc65217ebffcf3686e1d34.tar.gz
update for FFmpeg 2.1.5n2.1.5
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--RELEASE2
-rw-r--r--VERSION2
-rw-r--r--doc/Doxyfile2
3 files changed, 3 insertions, 3 deletions
diff --git a/RELEASE b/RELEASE
index 7d2ed7c702..cd57a8b95d 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-2.1.4
+2.1.5
diff --git a/VERSION b/VERSION
index 7d2ed7c702..cd57a8b95d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.4
+2.1.5
diff --git a/doc/Doxyfile b/doc/Doxyfile
index c925320e12..be5e534d9d 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = FFmpeg
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 2.1.4
+PROJECT_NUMBER = 2.1.5
# With the PROJECT_LOGO tag one can specify a logo or icon that is included
# in the documentation. The maximum height of the logo should not exceed 55