[FFmpeg-cvslog] update for 1.2.6

Michael Niedermayer git at videolan.org
Wed Mar 5 04:02:27 CET 2014


ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni at gmx.at> | Wed Mar  5 03:55:25 2014 +0100| [e63346f7e8d36f99ec85733823de6d1a0fd31f4f] | committer: Michael Niedermayer

update for 1.2.6

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

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

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

diff --git a/RELEASE b/RELEASE
index c813fe1..3c43790 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1.2.5
+1.2.6
diff --git a/VERSION b/VERSION
index c813fe1..3c43790 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.5
+1.2.6
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 0736a3d..e803996 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.5
+PROJECT_NUMBER         = 1.2.6
 
 # 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