warning & newline fixes by Dominik Mierzejewski <dominik@rangers.eu.org>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6336 b3059339-0415-0410-9bf9-f77b7e298cf2

14 files changed, 19 insertions, 9 deletions

diff --git a/Gui/mplayer/gtk/url.c b/Gui/mplayer/gtk/url.c
index 439fc7d702..4937d0700f 100644
--- a/Gui/mplayer/gtk/url.c
+++ b/Gui/mplayer/gtk/url.c
@@ -12,6 +12,7 @@
 #include "url.h"
 #include "../../interface.h"
 #include "../../events.h"
+#include "../widgets.h"
 
 GtkWidget * URL;
 int         gtkVURLDialogBox = 0;
diff --git a/Gui/mplayer/gtk/url.h b/Gui/mplayer/gtk/url.h
index 46d78b7eee..ed0a656586 100644
--- a/Gui/mplayer/gtk/url.h
+++ b/Gui/mplayer/gtk/url.h
@@ -8,4 +8,4 @@ extern int         gtkVURLDialogBox;
 extern void ShowURLDialogBox( void );
 extern GtkWidget * create_URL( void );
 
-#endif
\ No newline at end of file
+#endif
diff --git a/dll_init.h b/dll_init.h
index f1688ddd8d..99fa19a0c9 100644
--- a/dll_init.h
+++ b/dll_init.h
@@ -4,9 +4,11 @@
 extern char* win32_codec_name;  // must be set before calling DrvOpen() !!!
 
 int init_acm_audio_codec(sh_audio_t *sh_audio);
+int close_acm_audio_codec(sh_audio_t *sh_audio);
 int acm_decode_audio(sh_audio_t *sh_audio, void* a_buffer,int minlen,int maxlen);
 
 int init_vfw_video_codec(sh_video_t *sh_video,int ex);
+int vfw_close_video_codec(sh_video_t *sh_video, int ex);
 int vfw_decode_video(sh_video_t* sh_video,void* start,int in_size,int drop_frame,int ex);
 int vfw_set_postproc(sh_video_t* sh_video,int quality);
 
diff --git a/libao2/afmt.c b/libao2/afmt.c
index 85bbc30ff0..8463d6c5d9 100644
--- a/libao2/afmt.c
+++ b/libao2/afmt.c
@@ -81,4 +81,4 @@ int audio_out_format_bits(int format){
 	
     }
     return 8;
-}
\ No newline at end of file
+}
diff --git a/libdha/mtrr.c b/libdha/mtrr.c
index d4cc376feb..977ce80477 100644
--- a/libdha/mtrr.c
+++ b/libdha/mtrr.c
@@ -8,6 +8,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <string.h>
 #include <errno.h>
 #include "libdha.h"
 #include "AsmMacros.h"
@@ -81,4 +82,4 @@ int	mtrr_set_type(unsigned base,unsigned size,int type)
 {
     return ENOSYS;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/libmpcodecs/native/RTjpegN.c b/libmpcodecs/native/RTjpegN.c
index 4b7bb5b454..89da5079ca 100644
--- a/libmpcodecs/native/RTjpegN.c
+++ b/libmpcodecs/native/RTjpegN.c
@@ -358,7 +358,7 @@ int RTjpeg_s2b(__s16 *data, __s8 *strm, __u8 bt8, __u32 *qtbl)
     data[i]= 0;
     break;
   default: 
-	
+    break;
   } 
 
   if( bitoff == 0 ) {
diff --git a/libmpcodecs/vd_zlib.c b/libmpcodecs/vd_zlib.c
index a3c4f81e01..bd1d66c105 100644
--- a/libmpcodecs/vd_zlib.c
+++ b/libmpcodecs/vd_zlib.c
@@ -131,4 +131,4 @@ static mp_image_t* decode(sh_video_t *sh, void* data, int len, int flags)
 
     return mpi;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/libvo/aspect.c b/libvo/aspect.c
index be5d8949c7..c66e1f2f6c 100644
--- a/libvo/aspect.c
+++ b/libvo/aspect.c
@@ -101,7 +101,7 @@ void panscan_init( void )
 
 void panscan_calc( void )
 {
- int vo_panscan_area = (vo_screenheight-vo_dheight);
+ int vo_panscan_area = (aspdat.scrh-vo_dheight);
  vo_panscan_amount = vo_fs ? vo_panscan : 0;
  vo_panscan_x = vo_panscan_area * vo_panscan_amount * aspdat.asp;
  vo_panscan_y = vo_panscan_area * vo_panscan_amount;
diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index 7da081f1be..16ddc390aa 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -4,6 +4,9 @@
 #include "../postproc/rgb2rgb.h"
 
 // mga_vid drawing functions
+#ifdef VO_XMGA
+static void set_window( int ps );	/* forward declaration to kill warnings */
+#endif
 
 static int mga_next_frame=0;
 
diff --git a/loader/dshow/DS_VideoDecoder.h b/loader/dshow/DS_VideoDecoder.h
index 82e76f66a9..388f075126 100644
--- a/loader/dshow/DS_VideoDecoder.h
+++ b/loader/dshow/DS_VideoDecoder.h
@@ -23,6 +23,7 @@ int DS_VideoDecoder_SetDestFmt(DS_VideoDecoder *this, int bits, unsigned int csp
 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 */
diff --git a/loader/win32.c b/loader/win32.c
index 42bf21ddd4..84e590be19 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -788,6 +788,8 @@ static void* WINAPI expWaitForSingleObject(void* object, int duration)
 static int pf_set = 0;
 static BYTE PF[64] = {0,};
 
+static void WINAPI expGetSystemInfo(SYSTEM_INFO* si); /* forward declaration */
+
 static WIN_BOOL WINAPI expIsProcessorFeaturePresent(DWORD v)
 {
     WIN_BOOL result;
diff --git a/mmx_defs.h b/mmx_defs.h
index faf49741c0..997c8285d0 100644
--- a/mmx_defs.h
+++ b/mmx_defs.h
@@ -54,4 +54,4 @@
 #endif
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/mplayer.h b/mplayer.h
index 82e0baab19..e9641ffd8b 100644
--- a/mplayer.h
+++ b/mplayer.h
@@ -9,4 +9,4 @@ extern int vcd_track;
 
 extern void exit_player(char* how);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/my_profile.h b/my_profile.h
index 7c27a4b452..3a36d3a957 100644
--- a/my_profile.h
+++ b/my_profile.h
@@ -30,4 +30,4 @@ static inline unsigned long long int read_tsc( void )
 
 
 
-#endif
\ No newline at end of file
+#endif