Merge.

4 files changed, 12 insertions, 19 deletions

diff --git a/configure.ac b/configure.ac
index 34dd2a440..95774e221 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1206,8 +1206,7 @@ src/video_out/macosx/Makefile
 src/xine-utils/Makefile
 src/xine-engine/Makefile
 src/vdr/Makefile
-win32/Makefile
-win32/include/Makefile])
+win32/Makefile])
 AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]])
 AC_OUTPUT
 
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 34f982d18..855051582 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -1626,7 +1626,6 @@ static void ao_close(xine_audio_port_t *this_gen, xine_stream_t *stream) {
       }
       else
         fifo_wait_empty(this->out_fifo);
-      ao_set_property(this_gen, AO_PROP_DISCARD_BUFFERS, 0);
     }
 
     pthread_mutex_lock( &this->driver_lock );
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 934ddb81a..6f8795b5c 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -1,10 +1,19 @@
 include $(top_srcdir)/misc/Makefile.common
 
-SUBDIRS = include
-
 EXTRA_DIST = \
 	scripts/post_install.bat \
 	scripts/ffmpeg_win32.patch \
+	include/msvc/sys/time.h \
+	include/msvc/config.h \
+	include/msvc/inttypes.h \
+	include/msvc/stdint.h \
+	include/msvc/unistd.h \
+	include/sys/socket.h \
+	include/netinet/in.h \
+	include/sys/socket.h \
+	include/dlfcn.h \
+	include/netdb.h \
+	include/pwd.h \
 	config.h \
 	README \
 	libdvdnav.def \
diff --git a/win32/include/Makefile.am b/win32/include/Makefile.am
deleted file mode 100644
index e7f124586..000000000
--- a/win32/include/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include $(top_srcdir)/misc/Makefile.common
-
-EXTRA_DIST = \
-	msvc/sys/time.h \
-	msvc/config.h \
-	msvc/inttypes.h \
-	msvc/stdint.h \
-	msvc/unistd.h \
-	sys/socket.h \
-	netinet/in.h \
-	sys/socket.h \
-	dlfcn.h \
-	netdb.h \
-	pwd.h