[FFmpeg-cvslog] [ffmpeg-web] branch master updated. aeffb94 web/download: Add FFmpeg 2.6

[gitolite]

The branch, master has been updated
       via  aeffb94b8047d954ad3d224fb4efbeccd6c5fbbd (commit)
      from  095226557a7b2fe2d7a3f8e3290fc01023fbe6b4 (commit)


- Log -----------------------------------------------------------------
commit aeffb94b8047d954ad3d224fb4efbeccd6c5fbbd
Author:     Michael Niedermayer <michaelni at gmx.at>
AuthorDate: Sat Mar 7 00:12:53 2015 +0100
Commit:     Michael Niedermayer <michaelni at gmx.at>
CommitDate: Sat Mar 7 00:12:53 2015 +0100

    web/download: Add FFmpeg 2.6

diff --git a/src/download b/src/download
index b755431..426b43a 100644
--- a/src/download
+++ b/src/download
@@ -1,10 +1,10 @@
 
 <div id="download">
   <div class="btn-download-wrapper">
-    <a href="http://ffmpeg.org/releases/ffmpeg-2.5.4.tar.bz2" class="btn btn-success">
+    <a href="http://ffmpeg.org/releases/ffmpeg-2.6.tar.bz2" class="btn btn-success">
       <i class="fa fa-cloud-download"></i>
       Download
-      <small>ffmpeg-2.5.4.tar.bz2</small>
+      <small>ffmpeg-2.6.tar.bz2</small>
     </a>
     <br>
     <a href="#releases">More releases</a>
@@ -270,6 +270,44 @@
   </p>
 
 
+  <a name="release_2.6"></a><h3>
+    FFmpeg 2.6 "Grothendieck"</h3>
+
+  <p>
+    2.6 was released on 2015-03-07. It is the latest stable FFmpeg release
+    from the 2.6 release branch, which was cut from master on 2015-03-06.
+    Amongst lots of other changes, it includes all changes from
+    ffmpeg-mt, libav master of 2015-03-06, libav 11 as of 2015-03-06.
+  </p>
+  <p>It includes the following library versions:
+  </p>
+  <pre>
+libavutil      54. 20.100
+libavcodec     56. 26.100
+libavformat    56. 25.101
+libavdevice    56.  4.100
+libavfilter     5. 11.102
+libavresample   2.  1.  0
+libswscale      3.  1.101
+libswresample   1.  1.100
+libpostproc    53.  3.100</pre>
+
+  <div class="row">
+    <div class="col-md-4">
+      <a class="btn btn-success" href="releases/ffmpeg-2.6.tar.bz2">Download bzip2 tarball</a>
+      <small><a href="releases/ffmpeg-2.6.tar.bz2.asc">PGP signature</a></small>
+    </div> <!-- col -->
+    <div class="col-md-4">
+      <a class="btn btn-success" href="releases/ffmpeg-2.6.tar.gz">Download gzip tarball</a>
+      <small><a href="releases/ffmpeg-2.6.tar.gz.asc">PGP signature</a></small>
+    </div> <!-- col -->
+    <div class="col-md-4 text-right">
+      <small><a href="http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.6">Changelog</a></small>
+      <a class="btn btn-success" href="http://git.videolan.org/?p=ffmpeg.git;a=blob;f=RELEASE_NOTES;hb=release/2.6">Release Notes</a>
+    </div> <!-- col -->
+  </div> <!-- row -->
+
+
   <a name="release_2.5"></a><h3>
     FFmpeg 2.5.4 "Bohr"</h3>
 

-----------------------------------------------------------------------

Summary of changes:
 src/download |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 deletions(-)


hooks/post-receive
--