update for 2.2.6

Changelog by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

4 files changed, 13 insertions, 3 deletions

diff --git a/Changelog b/Changelog
index 85a971acba..b14ae5ef26 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,16 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
+version 2.2.6
+- fix infinite loop in dvbsub parser
+- fix some interlaced MPEG-2 videos
+- fix decoding issues in dv (Ticket2340, 2341)
+- fix v4l2 and v4l2enc crashes
+- fix theoretical librtmp crash
+- fix theorectical eamad crash
+- support dimension change in g2meet
+
+
 version 2.2:
 - HNM version 4 demuxer and video decoder
 - Live HDS muxer
diff --git a/RELEASE b/RELEASE
index 21bb5e156f..bda8fbec15 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-2.2.5
+2.2.6
diff --git a/VERSION b/VERSION
index 21bb5e156f..bda8fbec15 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.5
+2.2.6
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 6f19b103bf..e90c2b33fd 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.5
+PROJECT_NUMBER         = 2.2.6
 
 # 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