On the road to -pre1

diff --git a/NEWS b/NEWS
index 0debf914ae71819ff1e512bb25b2660eaed0a8b3..87099c7743e77d5383d464bfbb58ff444794c918 100644 (file)
--- 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 486a55d615102d97dd027b1a12fddd991d00b7ac..e574430b3b3f5c74090da7f0262d4bb15d137eea 100644 (file)
--- 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)