aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-25 21:43:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-25 21:43:19 +0200
commit36982b3616728033ad7868d845cc7438ceef3e76 (patch)
tree9aecf28cb3e739a802fa9310f8fcf0017c79b68d
parent5b5e61a0bf0d8f81ac5bf29b844af2c6e1081235 (diff)
downloadffmpeg-928e23d3baf9a2bbfb513862d64ed47a245eb280.tar.gz
Update for 0.10.6n0.10.6
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--Changelog15
-rw-r--r--Doxyfile2
-rw-r--r--RELEASE2
-rw-r--r--VERSION2
4 files changed, 18 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index 030ecbd8b8..bf7aa361be 100644
--- a/Changelog
+++ b/Changelog
@@ -3,6 +3,21 @@ releases are sorted from youngest to oldest.
version next:
+version 0.10.6:
+
+- many bug fixes that where found with Coverity
+
+- The following CVE fixes where backported:
+ CVE-2012-2796, CVE-2012-2775, CVE-2012-2772, CVE-2012-2776,
+ CVE-2012-2779, CVE-2012-2787, CVE-2012-2794, CVE-2012-2800,
+ CVE-2012-2802, CVE-2012-2801, CVE-2012-2786, CVE-2012-2798,
+ CVE-2012-2793, CVE-2012-2789, CVE-2012-2788, CVE-2012-2790,
+ CVE-2012-2777, CVE-2012-2784
+
+- hundreads of other bug fixes, some possibly security relevant,
+ see the git log for details.
+
+
version 0.10.5:
- Several bugs and crashes have been fixed as well as build problems
diff --git a/Doxyfile b/Doxyfile
index 9c0e3289ba..d77acba722 100644
--- a/Doxyfile
+++ b/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 = 0.10.5
+PROJECT_NUMBER = 0.10.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
diff --git a/RELEASE b/RELEASE
index 9028ec6365..69da6ebcd0 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-0.10.5
+0.10.6
diff --git a/VERSION b/VERSION
index 9028ec6365..69da6ebcd0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.10.5
+0.10.6