[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 94c25a4 web/security: make ordering of entries consistent

[gitolite]

The branch, master has been updated
       via  94c25a417ba207e3a17c07ca5da843eea5031b27 (commit)
       via  5cdab33134882a3634c56f65697137a2837e6fff (commit)
      from  d2c426da054a9ce776ced4e2f993066f1af5f157 (commit)


- Log -----------------------------------------------------------------
commit 94c25a417ba207e3a17c07ca5da843eea5031b27
Author:     Michael Niedermayer <michaelni at gmx.at>
AuthorDate: Tue Aug 27 02:48:58 2013 +0200
Commit:     Michael Niedermayer <michaelni at gmx.at>
CommitDate: Tue Aug 27 02:48:58 2013 +0200

    web/security: make ordering of entries consistent

diff --git a/src/security b/src/security
index 908d07d..e506b11 100644
--- a/src/security
+++ b/src/security
@@ -3,18 +3,6 @@
 <p>Please report vulnerabilities to <a href="mailto:ffmpeg-security at ffmpeg.org">ffmpeg-security at ffmpeg.org</a></p>
 
 <h2>FFmpeg 2.0</h2>
-<p>
-Fixes following vulnerabilities:
-</p>
-<pre>
-CVE-2013-3670, c1f2c4c3b49277d65b71ccdd3b6b2878f1b593eb
-CVE-2013-3671, 7edb984dd051b6919d7d8471c70499273f31b0fa
-CVE-2013-3672, 8d3c99e825317b7efda5fd12e69896b47c700303
-CVE-2013-3673, d23b8462b5a4a9da78ed45c4a7a3b35d538df909
-CVE-2013-3674, ad002e1a13a8df934bd6cb2c84175a4780ab8942
-CVE-2013-3675, 9dd04f6d8cdd1c10c28b2cb4252c1a41df581915
-</pre>
-
 <h3>2.0.1</h3>
 <p>
 Fixes following vulnerabilities:
@@ -25,17 +13,21 @@ CVE-2013-4264, acf511de34e0b79fff0183e06ed37f1aa8dc3d94 / 2960576378d17d71cc8dcc
 CVE-2013-4265, 211374e52a933a2b3f21a4d6e66e9f1b0623e44e / c94f9e854228e0ea00e1de8769d8d3f7cab84a55
 </pre>
 
-
-<h2>FFmpeg 1.2</h2>
+<h3>2.0</h3>
 <p>
 Fixes following vulnerabilities:
 </p>
 <pre>
-CVE-2013-2495, 3dbc0ff9c3e6f6e0d08ea3d42cb33761bae084ba
-CVE-2013-2496, e398990eb87785e20e065cd3f14d1dbb69df4392
-CVE-2013-0870, 14c8ee00ffd9d45e6e0c6f11a957ce7e56f7eb3a
+CVE-2013-3670, c1f2c4c3b49277d65b71ccdd3b6b2878f1b593eb
+CVE-2013-3671, 7edb984dd051b6919d7d8471c70499273f31b0fa
+CVE-2013-3672, 8d3c99e825317b7efda5fd12e69896b47c700303
+CVE-2013-3673, d23b8462b5a4a9da78ed45c4a7a3b35d538df909
+CVE-2013-3674, ad002e1a13a8df934bd6cb2c84175a4780ab8942
+CVE-2013-3675, 9dd04f6d8cdd1c10c28b2cb4252c1a41df581915
 </pre>
 
+
+<h2>FFmpeg 1.2</h2>
 <h3>1.2.1</h3>
 <p>
 Fixes following vulnerabilities:
@@ -49,6 +41,16 @@ CVE-2013-3674, 7ef2dbd2392e3e4d430e0173e1e5c4df9f18b6dd / ad002e1a13a8df934bd6cb
 CVE-2013-3675, 524d0d2cfc7bab1b348f85e7c0369859e63781cf / 9dd04f6d8cdd1c10c28b2cb4252c1a41df581915
 </pre>
 
+<h3>1.2</h3>
+<p>
+Fixes following vulnerabilities:
+</p>
+<pre>
+CVE-2013-2495, 3dbc0ff9c3e6f6e0d08ea3d42cb33761bae084ba
+CVE-2013-2496, e398990eb87785e20e065cd3f14d1dbb69df4392
+CVE-2013-0870, 14c8ee00ffd9d45e6e0c6f11a957ce7e56f7eb3a
+</pre>
+
 
 <h2>FFmpeg 1.1</h2>
 <h3>1.1.4</h3>

commit 5cdab33134882a3634c56f65697137a2837e6fff
Author:     Michael Niedermayer <michaelni at gmx.at>
AuthorDate: Tue Aug 27 02:47:37 2013 +0200
Commit:     Michael Niedermayer <michaelni at gmx.at>
CommitDate: Tue Aug 27 02:47:37 2013 +0200

    web/download: add 1.2.3

diff --git a/src/download b/src/download
index dca9141..ed52a04 100644
--- a/src/download
+++ b/src/download
@@ -347,10 +347,10 @@ ffmpeg-mt, libav master of 2013-07-09, libav 9 as of 2013-07-09.
 </p>
 
 <a name="release_1.2"></a><h2>
-FFmpeg 1.2.2 "Magic"</h2>
+FFmpeg 1.2.3 "Magic"</h2>
 
 <p>
-1.2.2 was released on 2013-07-28. It is the latest stable FFmpeg release
+1.2.3 was released on 2013-08-27. It is the latest stable FFmpeg release
 from the 1.2 release branch, which was cut from master on 2013-03-07.
 Amongst lots of other changes, it includes all changes from
 ffmpeg-mt, libav master of 2013-03-07, libav 9 as of 2013-03-07.
@@ -369,11 +369,11 @@ ffmpeg-mt, libav master of 2013-03-07, libav 9 as of 2013-03-07.
 </pre>
 
 <p>
-<a href="releases/ffmpeg-1.2.2.tar.bz2">Download bzip2 tarball</a>  
-<a href="releases/ffmpeg-1.2.2.tar.bz2.asc">PGP signature</a><br />
-<a href="releases/ffmpeg-1.2.2.tar.gz">Download gzip tarball</a>  
-<a href="releases/ffmpeg-1.2.2.tar.gz.asc">PGP signature</a><br />
-<a href="http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n1.2.2">Changelog</a><br />
+<a href="releases/ffmpeg-1.2.3.tar.bz2">Download bzip2 tarball</a>  
+<a href="releases/ffmpeg-1.2.3.tar.bz2.asc">PGP signature</a><br />
+<a href="releases/ffmpeg-1.2.3.tar.gz">Download gzip tarball</a>  
+<a href="releases/ffmpeg-1.2.3.tar.gz.asc">PGP signature</a><br />
+<a href="http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n1.2.3">Changelog</a><br />
 </p>
 
 <a name="old_releases"></a>

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

Summary of changes:
 src/download |   14 +++++++-------
 src/security |   36 +++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 24 deletions(-)


hooks/post-receive
--