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

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Mar 30 18:40:54 2010 +0200| [768a0aa2eac1006d0c08613df51e426d67189bd1] | committer: Jean-Baptiste Kempf 

On the road to -pre1

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=768a0aa2eac1006d0c08613df51e426d67189bd1
---

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

diff --git a/NEWS b/NEWS
index 0debf91..87099c7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Changes between 1.0.5 and 1.1.0-test:
+Changes between 1.0.5 and 1.1.0-pre1:
 ------------------------------------
 Important changes for users:
 
@@ -34,6 +34,7 @@ Decoders:
  * Support for AMR-NB audio codec on the Windows and Mac port
  * Improvements on the FLAC format (7.1 channels and 88.2/176.4/192 kHz support)
  * Direct rendering is always used with H.264 in avcodec module
+ * Partial Support for MPEG-4 ALS
 
 Demuxers:
  * Support for .aob files from DVD-Audio (MLP and LPCM)
diff --git a/configure.ac b/configure.ac
index 486a55d..e574430 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.0-git)
+AC_INIT(vlc, 1.1.0-pre1)
 VERSION_MAJOR="1"
 VERSION_MINOR="1"
 VERSION_REVISION="0"
-VERSION_EXTRA="-test"
+VERSION_EXTRA="-pre1"
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)