Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-16 05:52:53 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-01-16 05:52:53 +0400
commit884094debae78bc4bad8b6354373a7eec54b6ba1 (patch)
tree315699eb393316671e5df9acef0545d8639b5265
parentdb20610c4967696d3d0b7c48e2555593c2c1d59f (diff)
Update for 1.2.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 e8ea05db81..c813fe116c 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1.2.4
+1.2.5
diff --git a/VERSION b/VERSION
index e8ea05db81..c813fe116c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.4
+1.2.5
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 6740e77a3f..0736a3d351 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.4
+PROJECT_NUMBER = 1.2.5
# 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