aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-28 00:24:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-28 00:24:46 +0200
commit930d035e72ca78abf30d8627a82bbfd36fa350ac (patch)
tree7cb0006c6a3b9229e0082bb535b9758e8007f807
parent875649bfaef83172e44404930d755b76e36f9ba1 (diff)
downloadffmpeg-930d035e72ca78abf30d8627a82bbfd36fa350ac.tar.gz
update for 1.2.2n1.2.2
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 6085e94650..23aa839063 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1.2.1
+1.2.2
diff --git a/VERSION b/VERSION
index 6085e94650..23aa839063 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.1
+1.2.2
diff --git a/doc/Doxyfile b/doc/Doxyfile
index d3d5e42cfe..77d55d9294 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.1
+PROJECT_NUMBER = 1.2.2
# 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