[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 2596f5e web: add FFmpeg 2.2.12

[gitolite]

The branch, master has been updated
       via  2596f5ea7990dafcbfcff4f8ffcb56f319af02e3 (commit)
      from  989dbd23ab63c536f57dc7b992abdf9d0b2efd23 (commit)


- Log -----------------------------------------------------------------
commit 2596f5ea7990dafcbfcff4f8ffcb56f319af02e3
Author:     Michael Niedermayer <michaelni at gmx.at>
AuthorDate: Tue Jan 20 04:04:17 2015 +0100
Commit:     Michael Niedermayer <michaelni at gmx.at>
CommitDate: Tue Jan 20 04:04:17 2015 +0100

    web: add FFmpeg 2.2.12

diff --git a/src/download b/src/download
index 227242a..20c42f8 100644
--- a/src/download
+++ b/src/download
@@ -350,10 +350,10 @@ libpostproc    53.  0.100</pre>
   </div> <!-- row -->
 
   <a name="release_2.2"></a><h3>
-    FFmpeg 2.2.11 "Muybridge"</h3>
+    FFmpeg 2.2.12 "Muybridge"</h3>
 
   <p>
-    2.2.11 was released on 2014-12-09. It is the latest stable FFmpeg release
+    2.2.12 was released on 2015-01-20. It is the latest stable FFmpeg release
     from the 2.2 release branch, which was cut from master on 2014-03-01.
     Amongst lots of other changes, it includes all changes from
     ffmpeg-mt, libav master of 2014-03-01, libav 10.5 as of 2014-12-07.
@@ -373,15 +373,15 @@ libpostproc    52.  3.100</pre>
 
   <div class="row">
     <div class="col-md-4">
-      <a class="btn btn-success" href="releases/ffmpeg-2.2.11.tar.bz2">Download bzip2 tarball</a>
-      <small><a href="releases/ffmpeg-2.2.11.tar.bz2.asc">PGP signature</a></small>
+      <a class="btn btn-success" href="releases/ffmpeg-2.2.12.tar.bz2">Download bzip2 tarball</a>
+      <small><a href="releases/ffmpeg-2.2.12.tar.bz2.asc">PGP signature</a></small>
     </div> <!-- col -->
     <div class="col-md-4">
-      <a class="btn btn-success" href="releases/ffmpeg-2.2.11.tar.gz">Download gzip tarball</a>
-      <small><a href="releases/ffmpeg-2.2.11.tar.gz.asc">PGP signature</a></small>
+      <a class="btn btn-success" href="releases/ffmpeg-2.2.12.tar.gz">Download gzip tarball</a>
+      <small><a href="releases/ffmpeg-2.2.12.tar.gz.asc">PGP signature</a></small>
     </div> <!-- col -->
     <div class="col-md-4 text-right">
-      <a class="btn btn-success" href="http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.2.11">Changelog</a>
+      <a class="btn btn-success" href="http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.2.12">Changelog</a>
     </div> <!-- col -->
   </div> <!-- row -->
 
diff --git a/src/security b/src/security
index 59c8017..9a53911 100644
--- a/src/security
+++ b/src/security
@@ -135,6 +135,15 @@ CVE-2014-4610, d6af26c55c1ea30f85a7d9edbc373f53be1743ee
 
 <h2>FFmpeg 2.2</h2>
 
+<h3>2.2.12</h3>
+<p>
+Fixes following vulnerabilities:
+</p>
+<pre>
+CVE-2014-9603, 7279be7c75c38547994466b6f95bc3cadb05238b / 3030fb7e0d41836f8add6399e9a7c7b740b48bfd
+CVE-2014-9604, c351cd720a0c870dc09a15b6e191188978349bc7 / 3881606240953b9275a247a1c98a567f3c44890f
+</pre>
+
 <h3>2.2.11</h3>
 <p>
 Fixes following vulnerabilities:

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

Summary of changes:
 src/download |   14 +++++++-------
 src/security |    9 +++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)


hooks/post-receive
--