aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-09 14:31:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-09 14:31:52 +0100
commit1ea3248290a36c5fbde7863d6ad8cf91e18f3fc8 (patch)
tree04aef85a0f07c5c46cfca2579b4ccc4321581856
parentbdd2db60c2a60567f51df0a51693e7c35764cb14 (diff)
downloadffmpeg-1ea3248290a36c5fbde7863d6ad8cf91e18f3fc8.tar.gz
Update for FFmpeg 1.2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--RELEASE2
-rw-r--r--VERSION1
-rw-r--r--doc/Doxyfile2
3 files changed, 3 insertions, 2 deletions
diff --git a/RELEASE b/RELEASE
index 3d529fb483..5625e59da8 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1.1.git
+1.2
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000000..5625e59da8
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+1.2
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 7e6d0f56fd..55dd7a71d2 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 =
+PROJECT_NUMBER = 1.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