aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-11 20:16:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-11 20:16:12 +0200
commitc0ad5f9333f4bfb25ebfd95dcfd321d3175e076b (patch)
tree632dd55b9a3d594b06d138b94a85bf57dccf9b22
parentbb7f236c7fefa3a8918f1578bc4c82f38395ef94 (diff)
downloadffmpeg-c0ad5f9333f4bfb25ebfd95dcfd321d3175e076b.tar.gz
Update for 2.2.7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--Changelog6
-rw-r--r--RELEASE2
-rw-r--r--doc/Doxyfile2
3 files changed, 8 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index 8a87653e5d..1339a7b33f 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,12 @@
Entries are sorted chronologically from oldest to youngest within each release,
releases are sorted from youngest to oldest.
+version 2.2.7
+- snow: fix null pointer dereference
+- iff: fix out of array access
+- svq1dec: fix input data corruption
+
+
version 2.2.6
- fix infinite loop in dvbsub parser
- fix some interlaced MPEG-2 videos
diff --git a/RELEASE b/RELEASE
index bda8fbec15..5bc1cc43d4 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-2.2.6
+2.2.7
diff --git a/doc/Doxyfile b/doc/Doxyfile
index e90c2b33fd..6e757718f6 100644
--- a/doc/Doxyfile
+++ b/doc/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 = 2.2.6
+PROJECT_NUMBER = 2.2.7
# With the PROJECT_LOGO tag one can specify a logo or icon that is included
# in the documentation. The maximum height of the logo should not exceed 55