[FFmpeg-cvslog] Update for 1.2.5

Michael Niedermayer git at videolan.org
Thu Jan 16 02:54:46 CET 2014


ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 16 02:52:53 2014 +0100| [884094debae78bc4bad8b6354373a7eec54b6ba1] | committer: Michael Niedermayer

Update for 1.2.5

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=884094debae78bc4bad8b6354373a7eec54b6ba1
---

 RELEASE      |    2 +-
 VERSION      |    2 +-
 doc/Doxyfile |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RELEASE b/RELEASE
index e8ea05d..c813fe1 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1.2.4
+1.2.5
diff --git a/VERSION b/VERSION
index e8ea05d..c813fe1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.4
+1.2.5
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 6740e77..0736a3d 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



More information about the ffmpeg-cvslog mailing list