[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 70779b9 web/download: update for 2.5.1

[gitolite]

The branch, master has been updated
       via  70779b9c7ccb7a7a345b40fcc360094c08c1f5d7 (commit)
       via  ad76eb79a3822853eebbbb71576505fe72df4cf5 (commit)
      from  ed8c404568118d2da738c5c13c2b01e666fb738a (commit)


- Log -----------------------------------------------------------------
commit 70779b9c7ccb7a7a345b40fcc360094c08c1f5d7
Author:     Michael Niedermayer <michaelni at gmx.at>
AuthorDate: Tue Dec 16 00:04:27 2014 +0100
Commit:     Michael Niedermayer <michaelni at gmx.at>
CommitDate: Tue Dec 16 00:04:27 2014 +0100

    web/download: update for 2.5.1
    
    Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

diff --git a/src/download b/src/download
index deb4cb4..31cf4e5 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.tar.bz2" class="btn btn-success">
+    <a href="http://ffmpeg.org/releases/ffmpeg-2.5.1.tar.bz2" class="btn btn-success">
       <i class="fa fa-cloud-download"></i>
       Download
-      <small>ffmpeg-2.5.tar.bz2</small>
+      <small>ffmpeg-2.5.1.tar.bz2</small>
     </a>
     <br>
     <a href="#releases">More releases</a>
@@ -276,11 +276,11 @@
 
 
   <a name="release_2.5"></a><h3>
-    FFmpeg 2.5 "Bohr"</h3>
+    FFmpeg 2.5.1 "Bohr"</h3>
 
   <p>
-    2.5 was released on 2014-12-04. It is the latest stable FFmpeg release
-    from the 2.5 release branch, which was cut from master on 2014-12-04.
+    2.5.1 was released on 2014-12-15. It is the latest stable FFmpeg release
+    from the 2.5 release branch, which was cut from master on 2014-12-15.
     Amongst lots of other changes, it includes all changes from
     ffmpeg-mt, libav master of 2014-12-03, libav 11 as of 2014-12-03.
   </p>
@@ -299,15 +299,15 @@ libpostproc    53.  3.100</pre>
 
   <div class="row">
     <div class="col-md-4">
-      <a class="btn btn-success" href="releases/ffmpeg-2.5.tar.bz2">Download bzip2 tarball</a>
-      <small><a href="releases/ffmpeg-2.5.tar.bz2.asc">PGP signature</a></small>
+      <a class="btn btn-success" href="releases/ffmpeg-2.5.1.tar.bz2">Download bzip2 tarball</a>
+      <small><a href="releases/ffmpeg-2.5.1.tar.bz2.asc">PGP signature</a></small>
     </div> <!-- col -->
     <div class="col-md-4">
-      <a class="btn btn-success" href="releases/ffmpeg-2.5.tar.gz">Download gzip tarball</a>
-      <small><a href="releases/ffmpeg-2.5.tar.gz.asc">PGP signature</a></small>
+      <a class="btn btn-success" href="releases/ffmpeg-2.5.1.tar.gz">Download gzip tarball</a>
+      <small><a href="releases/ffmpeg-2.5.1.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.5">Changelog</a></small>
+      <small><a href="http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.5.1">Changelog</a></small>
       <a class="btn btn-success" href="http://git.videolan.org/?p=ffmpeg.git;a=blob;f=RELEASE_NOTES;hb=release/2.5">Release Notes</a>
     </div> <!-- col -->
   </div> <!-- row -->

commit ad76eb79a3822853eebbbb71576505fe72df4cf5
Author:     Michael Niedermayer <michaelni at gmx.at>
AuthorDate: Tue Dec 9 20:58:10 2014 +0100
Commit:     Michael Niedermayer <michaelni at gmx.at>
CommitDate: Tue Dec 9 20:58:10 2014 +0100

    web/security: add 2.2.11
    
    Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

diff --git a/src/security b/src/security
index 6d68fb8..3229ba0 100644
--- a/src/security
+++ b/src/security
@@ -103,6 +103,17 @@ CVE-2014-4610, d6af26c55c1ea30f85a7d9edbc373f53be1743ee
 
 <h2>FFmpeg 2.2</h2>
 
+<h3>2.2.11</h3>
+<p>
+Fixes following vulnerabilities:
+</p>
+<pre>
+CVE-2014-9316, 5d6f8bab02ba6d8434188172b31a4e1ac0a00756 / 0eecf40935b22644e6cd74c586057237ecfd6844
+CVE-2014-9317, d7470271c7ca3f412aac6b29fb4b8f22ad5c0238 / 79ceaf827be0b070675d4cd0a55c3386542defd8
+CVE-2014-9318, a06432b6c315fda5a9cc69059fd106d231e7da6c / 1d3a3b9f8907625b361420d48fe05716859620ff
+CVE-2014-9319, 4fde30ba9d050443fb14116fb206d0d37092bed0 / ea38e5a6b75706477898eb1e6582d667dbb9946c
+</pre>
+
 <h3>2.2.9</h3>
 <p>
 Fixes following vulnerabilities:

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

Summary of changes:
 src/download |   20 ++++++++++----------
 src/security |   11 +++++++++++
 2 files changed, 21 insertions(+), 10 deletions(-)


hooks/post-receive
--