[vlc-commits] commit: On the way to 1.1.6 (Jean-Baptiste Kempf )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Dec 29 22:41:05 2010 +0100| [31f33f49a104f3704672ff485f2b5b2a6052b7b4] | committer: Jean-Baptiste Kempf 

On the way to 1.1.6

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=31f33f49a104f3704672ff485f2b5b2a6052b7b4
---

 NEWS         |    7 +++++--
 configure.ac |    4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 873d60f..b762d1a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Changes between 1.1.5 and 1.1.6-git:
+Changes between 1.1.5 and 1.1.6:
 ---------------------------------
 
 Audio output:
@@ -11,7 +11,10 @@ Access:
 
 Decoders:
  * Support for MPC SV7 and SV8 on Windows and Mac OS X (Unix was already working)
-  * enabled FluidSynth MIDI playback plugin on Mac OS X
+ * Enabled FluidSynth MIDI playback plugin on Mac OS X
+
+Demuxers:
+ * Fix Buffer overflow in Real demuxer CVE-2010-3907 / VideoLAN-SA-1007
 
 Subtitles and renderer:
  * Do not auto-detect .txt files for subtitles
diff --git a/configure.ac b/configure.ac
index 7083bad..0467825 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team])
 
-AC_INIT(vlc, 1.1.6-git)
+AC_INIT(vlc, 1.1.6)
 VERSION_MAJOR="1"
 VERSION_MINOR="1"
 VERSION_REVISION="6"
-VERSION_EXTRA="-git"
+VERSION_EXTRA=""
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)