aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-12 14:28:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-12 14:28:03 +0100
commit2515907a45a99d3354ba0d3f29d9a59ba15f3593 (patch)
treedf88100cfd21998ff20116599939b00b1cd03c57
parent7e7772c13ad8c75786f3980ad4e118158697d4db (diff)
downloadffmpeg-2515907a45a99d3354ba0d3f29d9a59ba15f3593.tar.gz
Update for FFmpeg 1.2.12n1.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 c11470058f..f2ae0b4a2c 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1.2.11
+1.2.12
diff --git a/doc/Doxyfile b/doc/Doxyfile
index cb6298c478..b44cce6263 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 = 1.2.11
+PROJECT_NUMBER = 1.2.12
# With the PROJECT_LOGO tag one can specify an logo or icon that is included
# in the documentation. The maximum height of the logo should not exceed 55