aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-20 03:39:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-20 03:39:09 +0100
commit86a01362c0e46d155fbfc1ef19f5ba17af3ee69d (patch)
treeb9a9c656843ff764fdcf5b944c2acb7ea4773149
parent9789612689d71b9a5f3425596ecf8ead0058a9fd (diff)
downloadffmpeg-86a01362c0e46d155fbfc1ef19f5ba17af3ee69d.tar.gz
Update for FFmpeg 2.2.12n2.2.12
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--RELEASE2
-rw-r--r--doc/Doxyfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/RELEASE b/RELEASE
index 0b6e43134b..98c938ec34 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-2.2.11
+2.2.12
diff --git a/doc/Doxyfile b/doc/Doxyfile
index c8ef9233cd..4870ddce37 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.2.11
+PROJECT_NUMBER = 2.2.12
# 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