* Makefile.am: Parse mozilla after . so that the mozilla plugin gets its

    dependencies right.
  * src/stream_output/announce.c: Compilation fix.

Makefile.am

@@ -7,7 +7,7 @@ NULL =
 # SUBDIRS stores the directories where a "make" is required when building
 # something. DIST_SUBDIRS stores the directories where nothing is built but
 # which have makefiles with distribution information.
-SUBDIRS = intl modules mozilla . share po m4
+SUBDIRS = intl modules . mozilla share po m4
 DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools
 
 EXTRA_DIST = \

src/stream_output/announce.c

@@ -288,11 +288,11 @@ void sout_SAPDelete( sout_instance_t *p_sout, sap_session_t * p_sap )
     int i_ret;
 
 #if defined( UNDER_CE )
-    i_ret = CloseHandle( (HANDLE)p_sap->i_handle );
+    i_ret = CloseHandle( (HANDLE)p_sap->i_socket );
 #elif defined( WIN32 )
-    i_ret = closesocket( p_sap->i_handle );
+    i_ret = closesocket( p_sap->i_socket );
 #else
-    i_ret = close( p_sap->i_handle );
+    i_ret = close( p_sap->i_socket );
 #endif
 
     if( i_ret )