Merge svn changes up to r30702

10 files changed, 48 insertions, 46 deletions

diff --git a/DOCS/tech/nut.txt b/DOCS/tech/nut.txt
index ce1d34d69a..0d26d5f42b 100644
--- a/DOCS/tech/nut.txt
+++ b/DOCS/tech/nut.txt
@@ -1,5 +1,6 @@
-the nut spec has been moved to another svn repo you can find it at:
+The NUT specification has been moved to another Subversion repository.
+You can find it at:
 http://svn.mplayerhq.hu/nut/docs/nut.txt?view=markup
 
-its future location will be in a git repository, ill update this file
-here when its location changes again
+Its future location will be in a git repository. This file will be
+updated when its location changes again.
diff --git a/DOCS/tech/oggless-xiph-codecs.txt b/DOCS/tech/oggless-xiph-codecs.txt
index efbf4dc360..2b780b70de 100644
--- a/DOCS/tech/oggless-xiph-codecs.txt
+++ b/DOCS/tech/oggless-xiph-codecs.txt
@@ -1,5 +1,6 @@
-oggless-xiph-codecs.txt has been moved to another svn repo you can find it at:
+oggless-xiph-codecs.txt has been moved to another Subversion repository.
+You can find it at:
 http://svn.mplayerhq.hu/nut/docs/oggless-xiph-codecs.txt?view=markup
 
-its future location will be in a git repository, ill update this file
-here when its location changes again
+Its future location will be in a git repository. This file will be
+updated when its location changes again.
diff --git a/loader/module.c b/loader/module.c
index feaab14605..3eb024460a 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -849,7 +849,6 @@ static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t
 
 #endif
 
-#if 1
   // emulate some functions:
   switch(reg->eax){
   // memory management:
@@ -895,7 +894,6 @@ static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t
 #endif
       return 1;
   }
-#endif
 
 #if 0
   switch(reg->eax){
diff --git a/loader/win32.c b/loader/win32.c
index 3174c4e17d..fbd4d5a4e5 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -4611,6 +4611,7 @@ static INT WINAPI expMessageBoxA(HWND hWnd, LPCSTR text, LPCSTR title, UINT type
  * \param dest jump target
  */
 void exp_EH_prolog(void *dest);
+void exp_EH_prolog_dummy(void);
 //! just a dummy function that acts a container for the asm section
 void exp_EH_prolog_dummy(void) {
   __asm__ volatile (
diff --git a/mp3lib/decode_mmx.c b/mp3lib/decode_mmx.c
index de48cd41b7..211630f219 100644
--- a/mp3lib/decode_mmx.c
+++ b/mp3lib/decode_mmx.c
@@ -11,7 +11,6 @@
 #include "mangle.h"
 #include "mpg123.h"
 
-extern void (*dct64_MMX_func)(short*, short*, real*);
 static const unsigned long long attribute_used __attribute__((aligned(8))) null_one = 0x0000ffff0000ffffULL;
 static const unsigned long long attribute_used __attribute__((aligned(8))) one_null = 0xffff0000ffff0000ULL;
 const unsigned int __attribute__((aligned(16))) costab_mmx[] =
diff --git a/mp3lib/mpg123.h b/mp3lib/mpg123.h
index f55fb27e43..3d98366b4f 100644
--- a/mp3lib/mpg123.h
+++ b/mp3lib/mpg123.h
@@ -129,6 +129,15 @@ void dct36_3dnow(real *, real *, real *, real *, real *);
 void dct36_3dnowex(real *, real *, real *, real *, real *);
 void dct36_sse(real *, real *, real *, real *, real *);
 
+void dct64_MMX(short *, short *, real *);
+void dct64_MMX_3dnow(short *, short *, real *);
+void dct64_MMX_3dnowex(short *, short *, real *);
+void dct64_sse(short *, short *, real *);
+void dct64_altivec(real *, real *, real *);
+void (*dct64_MMX_func)(short *, short *, real *);
+
+void mp3lib_dct64(real *, real *, real *);
+
 typedef int (*synth_func_t)( real *,int,short * );
 typedef void (*dct36_func_t)(real *,real *,real *,real *,real *);
 
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index 43afb6a674..5a13344514 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -383,14 +383,6 @@ static int _has_mmx = 0;  // used by layer2.c, layer3.c to pre-scale coeffs
 /*           PUBLIC FUNCTIONS                  */
 /******************************************************************************/
 
-/* It's hidden from gcc in assembler */
-void dct64_MMX(short *, short *, real *);
-void dct64_MMX_3dnow(short *, short *, real *);
-void dct64_MMX_3dnowex(short *, short *, real *);
-void dct64_sse(short *, short *, real *);
-void dct64_altivec(real *, real *, real *);
-void (*dct64_MMX_func)(short *, short *, real *);
-
 #include "layer2.c"
 #include "layer3.c"
 #include "layer1.c"
diff --git a/stream/http.c b/stream/http.c
index f4ce03e038..bda6c060c7 100644
--- a/stream/http.c
+++ b/stream/http.c
@@ -47,8 +47,6 @@ extern const mime_struct_t mime_type_table[];
 extern int stream_cache_size;
 extern int network_bandwidth;
 
-int http_seek(stream_t *stream, off_t pos);
-
 typedef struct {
   unsigned metaint;
   unsigned metapos;
diff --git a/stream/network.h b/stream/network.h
index 8e1f5982b3..b842b1ed24 100644
--- a/stream/network.h
+++ b/stream/network.h
@@ -35,6 +35,7 @@
 #include <arpa/inet.h>
 #endif
 
+#include "stream.h"
 #include "url.h"
 #include "http.h"
 
@@ -52,29 +53,6 @@ typedef struct {
 	int demuxer_type;
 } mime_struct_t;
 
-typedef enum {
-	streaming_stopped_e,
-	streaming_playing_e
-} streaming_status;
-
-typedef struct streaming_control {
-	URL_t *url;
-	streaming_status status;
-	int buffering;	// boolean
-	unsigned int prebuffer_size;
-	char *buffer;
-	unsigned int buffer_size;
-	unsigned int buffer_pos;
-	unsigned int bandwidth;	// The downstream available
-	int (*streaming_read)( int fd, char *buffer, int buffer_size, struct streaming_control *stream_ctrl );
-	int (*streaming_seek)( int fd, off_t pos, struct streaming_control *stream_ctrl );
-	void *data;
-    // hacks for asf
-    int *audio_id_ptr;
-    int *video_id_ptr;
-} streaming_ctrl_t;
-
-//int streaming_start( stream_t *stream, int *demuxer_type, URL_t *url );
 streaming_ctrl_t *streaming_ctrl_new(void);
 int streaming_bufferize( streaming_ctrl_t *streaming_ctrl, char *buffer, int size);
 
@@ -88,4 +66,7 @@ HTTP_header_t *http_read_response(int fd);
 int http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry);
 URL_t* check4proxies(URL_t *url);
 
+void fixup_network_stream_cache(stream_t *stream);
+int http_seek(stream_t *stream, off_t pos);
+
 #endif /* MPLAYER_NETWORK_H */
diff --git a/stream/stream.h b/stream/stream.h
index 2dd65051c8..c48dd2a8b2 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -21,6 +21,7 @@
 
 #include "config.h"
 #include "mp_msg.h"
+#include "url.h"
 #include <string.h>
 #include <inttypes.h>
 #include <sys/types.h>
@@ -89,9 +90,27 @@
 #define STREAM_CTRL_SET_ANGLE 11
 
 
-#ifdef CONFIG_NETWORK
-#include "network.h"
-#endif
+typedef enum {
+	streaming_stopped_e,
+	streaming_playing_e
+} streaming_status;
+
+typedef struct streaming_control {
+	URL_t *url;
+	streaming_status status;
+	int buffering;	// boolean
+	unsigned int prebuffer_size;
+	char *buffer;
+	unsigned int buffer_size;
+	unsigned int buffer_pos;
+	unsigned int bandwidth;	// The downstream available
+	int (*streaming_read)( int fd, char *buffer, int buffer_size, struct streaming_control *stream_ctrl );
+	int (*streaming_seek)( int fd, off_t pos, struct streaming_control *stream_ctrl );
+	void *data;
+    // hacks for asf
+    int *audio_id_ptr;
+    int *video_id_ptr;
+} streaming_ctrl_t;
 
 struct stream;
 typedef struct stream_info_st {
@@ -143,6 +162,10 @@ typedef struct stream {
   unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE];
 } stream_t;
 
+#ifdef CONFIG_NETWORK
+#include "network.h"
+#endif
+
 int stream_fill_buffer(stream_t *s);
 int stream_seek_long(stream_t *s, off_t pos);
 
@@ -156,7 +179,6 @@ int cache_stream_seek_long(stream_t *s,off_t pos);
 #define cache_stream_seek_long(x,y) stream_seek_long(x,y)
 #define stream_enable_cache(x,y,z,w) 1
 #endif
-void fixup_network_stream_cache(stream_t *stream);
 int stream_write_buffer(stream_t *s, unsigned char *buf, int len);
 
 inline static int stream_read_char(stream_t *s){