[vlc-commits] commit: On the road to 1.1.5 (Jean-Baptiste Kempf )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Nov  2 23:34:20 2010 +0100| [18ae32d9a333c19ae132b6674b888249ea88ad72] | committer: Jean-Baptiste Kempf 

On the road to 1.1.5

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

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

diff --git a/NEWS b/NEWS
index 0d1d393..e230dfc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,19 +1,28 @@
-Changes between 1.1.4.1 and 1.1.5-git:
+Changes between 1.1.4.1 and 1.1.5:
 ----------------------------------
 
+Security:
+ * Fix a Samba crash, VideoLAN-SA-1006
+
 Demuxers:
  * DVDnav and DVDread fixes for encoding and misc issues
  * Playback of live http .Webm streams
+ * Taglib thread-safety fix
 
 Decoders:
  * Fix decoding of H264 using DxVA2 using Intel IGP, thanks to the donation from
    "Puget Systems"
 
 Skins:
- * add an icon to VLC
+ * Add an icon to VLC on Linux
+
+Video Output:
+ * fix a bug that could lead to 100% CPU usage on XCB
+
+Miscellaneous crashes and fixes in various plugins (telnet, live555, theora and TS-mux)
 
 Translations:
- * Update translations for Walloon, Estonian, Spanish, Turkish, Estonian
+ * Update translations for Walloon, Estonian, Spanish, Turkish, Estonian, Dutch
  * Major update and activation on Windows of Modern Greek
  * New Asturian translation
 
diff --git a/configure.ac b/configure.ac
index 4156eef..22af8e9 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.5-git)
+AC_INIT(vlc, 1.1.5)
 VERSION_MAJOR="1"
 VERSION_MINOR="1"
 VERSION_REVISION="5"
-VERSION_EXTRA="-git"
+VERSION_EXTRA=""
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)