Merge branch 'master' of git@git.videolan.org:vlc

NEWS

 Changes between 1.0.0 and 1.1.0-git:
 ------------------------------------
 
+Access:
+ * Port of the screen module from Xlib to XCB
+
+Demuxers:
+ * Support for ADPCM in .flv streams
+
 Mac OS X Interface:
  * Completely reworked user interface (based upon works from GSoC 2008)
 
@@ -11,6 +17,9 @@ Playlist:
 Audio filters:
  * Chorus/Flanger audio filter
 
+Encoders:
+ * x264, add psy-rd parameter and change default settings
+
 Visualisation:
  * Support of .milk visualisation files using projectM libraries
 

configure.ac

@@ -353,7 +353,7 @@ case "${host_os}" in
         VLC_ADD_LDFLAGS([vlc],[-mwindows])
         VLC_ADD_LIBS([activex mozilla],[-lgdi32])
         VLC_ADD_LIBS([cdda vcdx cddax sdl_image],[-lwinmm])
-        VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd],[-lws2_32])
+        VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi],[-lws2_32])
         VLC_ADD_LIBS([access_file], [-lshlwapi])
     fi
     if test "${SYS}" = "mingwce"; then
@@ -3738,26 +3738,26 @@ dnl uncompatible
 dnl
 AC_ARG_ENABLE(zvbi,
   AS_HELP_STRING([--enable-zvbi],[VBI (inc. Teletext) decoding support with
-		  libzvbi (default enabled)]))
+                  libzvbi (default enabled)]))
 AC_ARG_ENABLE(telx,
   AS_HELP_STRING([--enable-telx],[Teletext decoding module (conflicting with
-		  zvbi) (default enabled if zvbi is absent)]))
+                  zvbi) (default enabled if zvbi is absent)]))
 
 AS_IF( [test "${enable_zvbi}" != "no"],[
     PKG_CHECK_MODULES(ZVBI,
-    	zvbi-0.2 >= 0.2.25,
-    	[
-    	  VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS])
-    	  VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
+        zvbi-0.2 >= 0.2.25,
+        [
+          VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS])
+          VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
           VLC_ADD_PLUGIN([zvbi])
-	  AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built])
-	  AS_IF( [test "${enable_telx}" = "yes"],[
-		  AC_MSG_WARN([The zvbi and telx modules are uncompatibles.
-			       Using zvbi.])
-		  ])
-	],[
-	  AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead)
-	])
+          AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built])
+          AS_IF( [test "${enable_telx}" = "yes"],[
+                  AC_MSG_WARN([The zvbi and telx modules are uncompatibles.
+                               Using zvbi.])
+                  ])
+        ],[
+          AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead)
+        ])
     ])
 AS_IF( [test "${enable_telx}" != "no" ],[
   VLC_ADD_PLUGIN([telx])

extras/contrib/src/Makefile

@@ -1759,7 +1759,7 @@ ifdef HAVE_DARWIN_OS
 	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -fnested-functions" && make && make install)
 else
 ifdef HAVE_WIN32
-	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) --std=gnu99" LIBS="-lpthreadGC2" && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -DPTW32_STATIC_LIB --std=gnu99"  && make && make install)
 else
 	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make -C src && make -C src install)
 endif
@@ -2417,28 +2417,6 @@ CLEAN_FILE += .ncurses
 CLEAN_PKG += ncurses
 DISTCLEAN_PKG += ncurses-$(NCURSES_VERSION).tar.gz
 
-# ***************************************************************************
-# asa library (ASS/SSA support)
-# ***************************************************************************
-
-asa.git.tar.gz:
-	$(WGET) $(ASA_URL)
-
-asa: asa.git.tar.gz
-	$(EXTRACT_GZ)
-	patch -p0 < Patches/asa-git.diff
-
-.asa: asa .fontconfig .pcre .iconv
-	(cd $<; ./bootstrap; $(HOSTCC) CFLAGS="$(CFLAGS) -DPCRE_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX))
-	(cd $</lib/import; make || (echo "Please copy a ./preparse file you built for your host into asa/lib/import"; echo "When you are finished, press enter." ; echo "If you are building natively, press enter." ; read i ; make) )
-	(cd $<; make && make install)
-	$(INSTALL_NAME)
-	touch $@
-
-CLEAN_FILE += .asa
-CLEAN_PKG += asa
-DISTCLEAN_PKG += asa.git.tar.gz
-
 # ***************************************************************************
 # FluidSynth library (Midi)
 # ***************************************************************************

extras/package/win32/configure-common.sh

@@ -28,5 +28,5 @@
       --enable-sse --enable-mmx \
       --disable-gnomevfs --disable-hal \
       --disable-cddax --disable-vcdx --disable-libcdio --disable-vcdinfo \
-      --disable-libcddb --disable-dvb --disable-zvbi --enable-telx \
+      --disable-libcddb --disable-dvb --enable-zvbi --disable-telx \
       --disable-pulse