update for 2.2.6

Changelog by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 12:31:18 +02:00 · 2014-08-05 12:31:18 +02:00 · 2cbdbc3670
commit 2cbdbc3670
parent 119131fcbf
4 changed files with 13 additions and 3 deletions
--- a/10
+++ b/10
@ -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
--- a/2
+++ b/2
@ -1 +1 @@
-2.2.5
+2.2.6
--- a/2
+++ b/2
@ -1 +1 @@
-2.2.5
+2.2.6
--- 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
 @ -1 +1 @@
 .2.5
 .2.6