[MPlayer-users] [PATCH] some compilation warnings fixes
Dominik Mierzejewski
dominik at rangers.eu.org
Sat Apr 6 14:53:02 CEST 2002
Included are two patches, one for console player and one for the GUI.
--
"The Universe doesn't give you any points for doing things that are easy."
-- Sheridan to Garibaldi in Babylon 5:"The Geometry of Shadows"
Dominik 'Rathann' Mierzejewski <rathann(at)rangers.eu.org>
-------------- next part --------------
--- MPlayer-20020321/Gui/mplayer/gtk/menu.h.gui Wed Nov 14 18:48:38 2001
+++ MPlayer-20020321/Gui/mplayer/gtk/menu.h Thu Mar 21 18:55:03 2002
@@ -10,4 +10,4 @@
extern GtkWidget * AddSeparator( GtkWidget * Menu );
extern GtkWidget * create_PopUpMenu( void );
-#endif
\ No newline at end of file
+#endif
--- MPlayer-20020321/Gui/mplayer/gtk/opts.h.gui Wed Nov 14 17:05:33 2001
+++ MPlayer-20020321/Gui/mplayer/gtk/opts.h Thu Mar 21 18:55:03 2002
@@ -6,4 +6,4 @@
void HideOptions( void );
GtkWidget * create_Options( void );
-#endif
\ No newline at end of file
+#endif
--- MPlayer-20020321/Gui/mplayer/play.c.gui Thu Mar 14 17:38:46 2002
+++ MPlayer-20020321/Gui/mplayer/play.c Thu Mar 21 19:03:37 2002
@@ -1,6 +1,7 @@
#include <inttypes.h>
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include <unistd.h>
#include <signal.h>
--- MPlayer-20020321/Gui/wm/ws.c.gui Thu Mar 14 17:38:47 2002
+++ MPlayer-20020321/Gui/wm/ws.c Thu Mar 21 18:55:03 2002
@@ -22,6 +22,7 @@
#include "ws.h"
#include "wsconv.h"
#include "../../postproc/rgb2rgb.h"
+#include "../mplayer/mplayer.h"
#include <X11/extensions/XShm.h>
#ifdef HAVE_XSHAPE
--- MPlayer-20020321/Gui/app.c.gui Fri Mar 8 01:43:50 2002
+++ MPlayer-20020321/Gui/app.c Thu Mar 21 18:55:03 2002
@@ -13,6 +13,8 @@
#include "mplayer/mplayer.h"
#include "interface.h"
+extern char *get_path(char *);
+
listItems appMPlayer;
char * skinDirInHome=NULL;
-------------- next part --------------
--- MPlayer-20020326/TOOLS/cache2.c.warn Wed Jul 18 03:28:01 2001
+++ MPlayer-20020326/TOOLS/cache2.c Tue Mar 26 22:10:19 2002
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include "../linux/shmem.h"
typedef struct {
--- MPlayer-20020326/libmpdemux/asf_streaming.c.warn Sun Jan 27 15:27:58 2002
+++ MPlayer-20020326/libmpdemux/asf_streaming.c Tue Mar 26 22:10:19 2002
@@ -31,6 +31,8 @@
extern int audio_id,video_id;
extern int verbose;
+int asf_http_streaming_start( stream_t *stream );
+
// ASF streaming support several network protocol.
// One use UDP, not known, yet!
// Another is HTTP, this one is known.
--- MPlayer-20020326/libmpdemux/demux_asf.c.warn Mon Jan 21 00:37:12 2002
+++ MPlayer-20020326/libmpdemux/demux_asf.c Tue Mar 26 22:10:19 2002
@@ -11,7 +11,8 @@
#include "stream.h"
#include "asf.h"
#include "demuxer.h"
-
+#include "stheader.h"
+#include "../dec_audio.h"
/*
* Load 16/32-bit values in little endian byte order
--- MPlayer-20020326/libmpdemux/demux_avi.c.warn Mon Feb 18 22:30:17 2002
+++ MPlayer-20020326/libmpdemux/demux_avi.c Tue Mar 26 22:10:19 2002
@@ -11,6 +11,7 @@
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
+#include "../dec_audio.h"
#include "aviheader.h"
--- MPlayer-20020326/libmpdemux/demux_mpg.c.warn Mon Feb 18 22:30:17 2002
+++ MPlayer-20020326/libmpdemux/demux_mpg.c Tue Mar 26 22:10:19 2002
@@ -13,6 +13,7 @@
#include "parse_es.h"
#include "stheader.h"
#include "mp3_hdr.h"
+#include "../dec_audio.h"
#include "dvdauth.h"
--- MPlayer-20020326/libmpdemux/demuxer.c.warn Thu Mar 21 00:23:48 2002
+++ MPlayer-20020326/libmpdemux/demuxer.c Tue Mar 26 22:10:19 2002
@@ -395,6 +395,7 @@
ds->buffer_pos+=len;
return len;
}
+ return 1;
}
// ====================================================================
--- MPlayer-20020326/libmpdemux/network.c.warn Sun Mar 3 22:30:42 2002
+++ MPlayer-20020326/libmpdemux/network.c Tue Mar 26 22:10:19 2002
@@ -30,6 +30,8 @@
extern int verbose;
extern m_config_t *mconfig;
+extern int asf_streaming_start( stream_t *stream );
+
static struct {
char *mime_type;
int demuxer_type;
--- MPlayer-20020326/libmpdemux/network.h.warn Mon Feb 18 22:30:17 2002
+++ MPlayer-20020326/libmpdemux/network.h Tue Mar 26 22:10:19 2002
@@ -47,4 +47,6 @@
int connect2Server(char *host, int port);
+int autodetectProtocol(streaming_ctrl_t *streaming_ctrl, int *fd_out, int *file_format);
+
#endif
--- MPlayer-20020326/libmpdemux/open.c.warn Mon Feb 18 22:30:17 2002
+++ MPlayer-20020326/libmpdemux/open.c Tue Mar 26 22:10:19 2002
@@ -23,6 +23,7 @@
#include "url.h"
#include "network.h"
static URL_t* url;
+extern int streaming_start(stream_t *stream, URL_t *url, int demuxer_type);
#endif
int dvd_title=0;
--- MPlayer-20020326/libvo/fastmemcpy.h.warn Mon Feb 18 22:30:17 2002
+++ MPlayer-20020326/libvo/fastmemcpy.h Tue Mar 26 22:10:19 2002
@@ -13,10 +13,12 @@
#define memcpy(a,b,c) fast_memcpy(a,b,c)
#else /* HAVE_MMX/MMX2/3DNOW/SSE/SSE2 */
+#include <string.h>
#define mem2agpcpy(a,b,c) memcpy(a,b,c)
#endif
#else /* USE_FASTMEMCPY */
+#include <string.h>
#define mem2agpcpy(a,b,c) memcpy(a,b,c)
#endif
--- MPlayer-20020326/loader/dshow/DS_VideoDecoder.h.warn Mon Jan 21 00:37:36 2002
+++ MPlayer-20020326/loader/dshow/DS_VideoDecoder.h Tue Mar 26 22:10:19 2002
@@ -23,6 +23,7 @@
int DS_VideoDecoder_SetDirection(DS_VideoDecoder *this, int d);
int DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* value);
int DS_VideoDecoder_SetValue(DS_VideoDecoder *this, const char* name, int value);
+int DS_SetAttr_DivX(char* attribute, int value);
#endif /* AVIFILE_DS_VIDEODECODER_H */
--- MPlayer-20020326/loader/registry.c.warn Mon Feb 18 22:30:21 2002
+++ MPlayer-20020326/loader/registry.c Tue Mar 26 22:10:19 2002
@@ -15,6 +15,7 @@
#include "ext.h"
#include "registry.h"
+extern char *get_path(char *filename);
//#undef TRACE
//#define TRACE printf
--- MPlayer-20020326/mp3lib/dct64_3dnow.c.warn Tue Mar 26 21:51:49 2002
+++ MPlayer-20020326/mp3lib/dct64_3dnow.c Tue Mar 26 22:10:19 2002
@@ -913,4 +913,4 @@
:
:"m"(a),"m"(b),"m"(c),"m"(tmp[0])
:"memory","%ebx","%esi","%edi");
-}
\ No newline at end of file
+}
--- MPlayer-20020326/mp3lib/dct64_k7.c.warn Tue Mar 26 21:51:49 2002
+++ MPlayer-20020326/mp3lib/dct64_k7.c Tue Mar 26 22:10:19 2002
@@ -791,4 +791,4 @@
:
:"m"(a),"m"(b),"m"(c),"m"(tmp[0])
:"memory","%ebx","%esi","%edi");
-}
\ No newline at end of file
+}
--- MPlayer-20020326/libdha/libdha.h.warn Sat Feb 2 13:14:56 2002
+++ MPlayer-20020326/libdha/libdha.h Tue Mar 26 22:10:19 2002
@@ -70,4 +70,4 @@
}
#endif
-#endif
\ No newline at end of file
+#endif
--- MPlayer-20020326/libdha/mtrr.c.warn Sun Feb 3 14:19:39 2002
+++ MPlayer-20020326/libdha/mtrr.c Tue Mar 26 22:10:19 2002
@@ -8,6 +8,7 @@
#include "config.h"
#include <stdio.h>
+#include <string.h>
#include <errno.h>
#include "libdha.h"
#include "AsmMacros.h"
@@ -50,4 +51,4 @@
{
return ENOSYS;
}
-#endif
\ No newline at end of file
+#endif
--- MPlayer-20020326/libdha/pci.c.warn Sun Jan 20 13:15:01 2002
+++ MPlayer-20020326/libdha/pci.c Tue Mar 26 22:10:19 2002
@@ -736,4 +736,4 @@
int disable_app_io( void )
{
return disable_os_io();
-}
\ No newline at end of file
+}
--- MPlayer-20020326/libmpcodecs/vd_zlib.c.warn Tue Mar 26 22:35:06 2002
+++ MPlayer-20020326/libmpcodecs/vd_zlib.c Tue Mar 26 22:34:42 2002
@@ -131,4 +131,4 @@
return mpi;
}
-#endif
\ No newline at end of file
+#endif
--- MPlayer-20020326/libmpcodecs/ad_msadpcm.c.warn Tue Mar 26 22:40:02 2002
+++ MPlayer-20020326/libmpcodecs/ad_msadpcm.c Tue Mar 26 22:40:14 2002
@@ -5,6 +5,8 @@
#include "config.h"
#include "ad_internal.h"
+#include "../adpcm.h"
+
static ad_info_t info =
{
"MS ADPCM audio decoder",
--- MPlayer-20020326/libmpcodecs/ad_dk4adpcm.c.warn Tue Mar 26 06:34:41 2002
+++ MPlayer-20020326/libmpcodecs/ad_dk4adpcm.c Tue Mar 26 22:39:43 2002
@@ -5,6 +5,8 @@
#include "config.h"
#include "ad_internal.h"
+#include "../adpcm.h"
+
static ad_info_t info =
{
"Duck DK4 ADPCM (rogue format number) audio decoder",
--- MPlayer-20020326/my_profile.h.warn Sun Nov 11 16:20:19 2001
+++ MPlayer-20020326/my_profile.h Tue Mar 26 22:10:19 2002
@@ -30,4 +30,4 @@
-#endif
\ No newline at end of file
+#endif
--- MPlayer-20020326/mplayer.h.warn Fri Mar 8 01:43:46 2002
+++ MPlayer-20020326/mplayer.h Tue Mar 26 22:10:19 2002
@@ -6,4 +6,4 @@
extern char* current_module;
extern int fullscreen;
-#endif
\ No newline at end of file
+#endif
--- MPlayer-20020326/RTjpegN.c.warn Fri Dec 28 19:01:42 2001
+++ MPlayer-20020326/RTjpegN.c Tue Mar 26 22:10:19 2002
@@ -358,7 +358,7 @@
data[i]= 0;
break;
default:
-
+ break;
}
if( bitoff == 0 ) {
More information about the MPlayer-users
mailing list