[MPlayer-dev-eng] [PATCH] ^M's in the source

[Kresimir Kukulj]

Hi

	I don't know if you consider ^M cosmetic fixes, but anyway, patch is
attached.

Also, following files are saved with CR/LF:

libao2/ao_win32.c
libavcodec/ppc/mpegvideo_ppc.c
loader/qtx/qtxsdk/select.h
loader/wine/avifmt.h

Patch does not fix them because I don't know if that was intentional.

-- 
Kresimir Kukulj                      madmax at iskon.hr
+--------------------------------------------------+
Old PC's never die. They just become Unix terminals.
-------------- next part --------------
diff -ruN main-cvs20030101/libaf/af_channels.c main/libaf/af_channels.c
--- main-cvs20030101/libaf/af_channels.c	Wed Jan  1 22:59:20 2003
+++ main/libaf/af_channels.c	Thu Jan  2 01:01:25 2003
@@ -86,7 +86,7 @@
 {
   int i;
   if((s->nr < 1) || (s->nr > AF_NCH)){
-    af_msg(AF_MSG_ERROR,"[channels] The number of routing pairs musst be" 
+    af_msg(AF_MSG_ERROR,"[channels] The number of routing pairs must be" 
 	   " between 1 and %i. Current value is %i\n",AF_NCH,s->nr);
     return AF_ERROR;
   }
@@ -149,7 +149,7 @@
       int ch = 0;
       // Sanity check
       if((s->nr < 1) || (s->nr > AF_NCH)){
-	af_msg(AF_MSG_ERROR,"[channels] The number of routing pairs musst be" 
+	af_msg(AF_MSG_ERROR,"[channels] The number of routing pairs must be" 
 	     " between 1 and %i. Current value is %i\n",AF_NCH,s->nr);
       }	
       s->router = 1;
diff -ruN main-cvs20030101/libmpcodecs/vd_mpng.c main/libmpcodecs/vd_mpng.c
--- main-cvs20030101/libmpcodecs/vd_mpng.c	Sun Dec 22 23:04:47 2002
+++ main/libmpcodecs/vd_mpng.c	Thu Jan  2 00:59:25 2003
@@ -82,7 +82,7 @@
  png_set_sig_bytes( png,8 );
  png_read_info( png,info );
  png_get_IHDR( png,info,&png_width,&png_height,&depth,&color,NULL,NULL,NULL );
-
 png_set_bgr( png );
+ png_set_bgr( png );
 
  switch( info->color_type ) {
    case PNG_COLOR_TYPE_GRAY_ALPHA:
diff -ruN main-cvs20030101/libvo/vesa_lvo.h main/libvo/vesa_lvo.h
--- main-cvs20030101/libvo/vesa_lvo.h	Sun Dec 22 23:04:49 2002
+++ main/libvo/vesa_lvo.h	Thu Jan  2 00:59:48 2003
@@ -12,7 +12,7 @@
 #ifndef __VESA_LVO_INCLUDED
 #define __VESA_LVO_INCLUDED
 
-int	 vlvo_preinit(
const char *drvname);
+int	 vlvo_preinit(const char *drvname);
 int      vlvo_init(unsigned src_width,unsigned src_height,
 		   unsigned x_org,unsigned y_org,unsigned dst_width,
 		   unsigned dst_height,unsigned format,unsigned dest_bpp);
diff -ruN main-cvs20030101/loader/com.h main/loader/com.h
--- main-cvs20030101/loader/com.h	Fri Sep 13 21:43:13 2002
+++ main/loader/com.h	Thu Jan  2 01:00:14 2003
@@ -72,7 +72,7 @@
     struct IClassFactory_vt* vt;
 };
 
-long CoCreateInstance(GUID* rclsid, struct IUnknown* pUnkOuter,
+long CoCreateInstance(GUID* rclsid, struct IUnknown* pUnkOuter,
 		      long dwClsContext, const GUID* riid, void** ppv);
 
 #ifdef __cplusplus
diff -ruN main-cvs20030101/loader/module.c main/loader/module.c
--- main-cvs20030101/loader/module.c	Sun Dec 22 23:04:50 2002
+++ main/loader/module.c	Thu Jan  2 01:02:03 2003
@@ -561,13 +561,13 @@
 
 #ifdef DEBUG_QTX_API
 
-struct ComponentParameters {
-    unsigned char                   flags;                      /* call modifiers: sync/async, deferred, immed, etc */
-    unsigned char                   paramSize;                  /* size in bytes of actual parameters passed to this call */
-    short                           what;                       /* routine selector, negative for Component management calls */
-    long                            params[1];                  /* actual parameters for the indicated routine */
-};
-typedef struct ComponentParameters      ComponentParameters;
+struct ComponentParameters {
+    unsigned char                   flags;                      /* call modifiers: sync/async, deferred, immed, etc */
+    unsigned char                   paramSize;                  /* size in bytes of actual parameters passed to this call */
+    short                           what;                       /* routine selector, negative for Component management calls */
+    long                            params[1];                  /* actual parameters for the indicated routine */
+};
+typedef struct ComponentParameters      ComponentParameters;
 
 static char* component_func(int what){
 switch(what){
diff -ruN main-cvs20030101/loader/qtx/qtxload.c main/loader/qtx/qtxload.c
--- main-cvs20030101/loader/qtx/qtxload.c	Tue Nov 26 02:29:11 2002
+++ main/loader/qtx/qtxload.c	Thu Jan  2 01:02:55 2003
@@ -41,7 +41,7 @@
     void* theqtdp=NULL;
     void* compcall=NULL;
     void* compcallws=NULL;
-    ComponentResult (*
dispatcher)(ComponentParameters *params, Globals glob);
+    ComponentResult (*dispatcher)(ComponentParameters *params, Globals glob);
     ComponentResult ret;
     ComponentParameters *params;
     ComponentDescription desc;
diff -ruN main-cvs20030101/loader/win32.c main/loader/win32.c
--- main-cvs20030101/loader/win32.c	Wed Jan  1 22:59:29 2003
+++ main/loader/win32.c	Thu Jan  2 01:03:38 2003
@@ -3180,7 +3180,7 @@
     {0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}
 };
 
-static long WINAPI expCoCreateInstance(GUID* rclsid, struct IUnknown* pUnkOuter,
+static long WINAPI expCoCreateInstance(GUID* rclsid, struct IUnknown* pUnkOuter,
 				       long dwClsContext, const GUID* riid, void** ppv)
 {
     int i;