Mercurial > mplayer.hg

changeset 11412:ec3dac7d17a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Warning fixes (approved by A'rpi).
author rathann
date Sat, 08 Nov 2003 00:26:51 +0000
parents cb070e67a9c9
children e250b0e9e608
files Gui/cfg.c Gui/interface.c libmpcodecs/pullup.c libmpcodecs/pullup.h libmpdemux/asf_mmst_streaming.c libmpdemux/demux_ts.c libmpdemux/url.c libvo/vo_fbdev.c libvo/vo_fbdev2.c loader/qtx/qtxsdk/components.h m_option.c
diffstat 11 files changed, 34 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/cfg.c	Sat Nov 08 00:09:15 2003 +0000
+++ b/Gui/cfg.c	Sat Nov 08 00:26:51 2003 +0000
@@ -72,6 +72,7 @@
 extern int    flip;
 extern int    frame_dropping;
 extern int    stop_xscreensaver;
+extern int    m_config_parse_config_file(m_config_t* config, char *conffile);
 
 static m_config_t * gui_conf;
 static m_option_t gui_opts[] =
--- a/Gui/interface.c	Sat Nov 08 00:09:15 2003 +0000
+++ b/Gui/interface.c	Sat Nov 08 00:26:51 2003 +0000
@@ -1051,7 +1051,7 @@
 	return NULL;
    case gtkSetExtraStereo:
         gtkAOExtraStereoMul=fparam;
-	audio_plugin_extrastereo.control( AOCONTROL_PLUGIN_ES_SET,(int)&gtkAOExtraStereoMul );
+	audio_plugin_extrastereo.control( AOCONTROL_PLUGIN_ES_SET,(void *)&gtkAOExtraStereoMul );
         return NULL;
    case gtkSetPanscan:
         {
@@ -1082,7 +1082,7 @@
         if ( eq )
 	 {
           gtkEquChannels[eq->channel][eq->band]=eq->gain;
-	  audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)eq );
+	  audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(void *)eq );
 	 }
 	 else
 	  {
@@ -1090,7 +1090,7 @@
 	   memset( gtkEquChannels,0,sizeof( gtkEquChannels ) );
 	   for ( i=0;i<6;i++ )
 	    for ( j=0;j<10;j++ )
-	     { tmp.channel=i; tmp.band=j; audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)&tmp ); }
+	     { tmp.channel=i; tmp.band=j; audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(void *)&tmp ); }
 	  }
 	return NULL;
   }
--- a/libmpcodecs/pullup.c	Sat Nov 08 00:09:15 2003 +0000
+++ b/libmpcodecs/pullup.c	Sat Nov 08 00:26:51 2003 +0000
@@ -1,6 +1,8 @@
 
 
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "pullup.h"
 #include "config.h"
 
@@ -321,7 +323,7 @@
 	}
 }
 
-int pullup_submit_field(struct pullup_context *c, struct pullup_buffer *b, int parity)
+void pullup_submit_field(struct pullup_context *c, struct pullup_buffer *b, int parity)
 {
 	struct pullup_field *f;
 	
@@ -329,7 +331,7 @@
 	check_field_queue(c);
 	
 	/* Cannot have two fields of same parity in a row; drop the new one */
-	if (c->last && c->last->parity == parity) return 0;
+	if (c->last && c->last->parity == parity) return;
 
 	f = c->head;
 	f->parity = parity;
--- a/libmpcodecs/pullup.h	Sat Nov 08 00:09:15 2003 +0000
+++ b/libmpcodecs/pullup.h	Sat Nov 08 00:26:51 2003 +0000
@@ -64,7 +64,7 @@
 void pullup_release_buffer(struct pullup_buffer *b, int parity);
 struct pullup_buffer *pullup_get_buffer(struct pullup_context *c, int parity);
 
-int pullup_submit_field(struct pullup_context *c, struct pullup_buffer *b, int parity);
+void pullup_submit_field(struct pullup_context *c, struct pullup_buffer *b, int parity);
 void pullup_flush_fields(struct pullup_context *c);
 
 struct pullup_frame *pullup_get_frame(struct pullup_context *c);
--- a/libmpdemux/asf_mmst_streaming.c	Sat Nov 08 00:09:15 2003 +0000
+++ b/libmpdemux/asf_mmst_streaming.c	Sat Nov 08 00:26:51 2003 +0000
@@ -118,7 +118,7 @@
     size_t len1, len2;
     char *ip, *op;
 
-    if (url_conv != -1)
+    if (url_conv != (iconv_t)(-1))
     {
     memset(dest, 0, 1000);
     len1 = len; len2 = 1000;
@@ -588,7 +588,7 @@
   printf("mmst packet_length = %d\n",packet_length);
 
 #ifdef USE_ICONV
-  if (url_conv != -1)
+  if (url_conv != (iconv_t)(-1))
     iconv_close(url_conv);
 #endif
 
--- a/libmpdemux/demux_ts.c	Sat Nov 08 00:09:15 2003 +0000
+++ b/libmpdemux/demux_ts.c	Sat Nov 08 00:26:51 2003 +0000
@@ -31,6 +31,7 @@
 
 #include "stream.h"
 #include "demuxer.h"
+#include "parse_es.h"
 #include "stheader.h"
 
 #include "bswap.h"
--- a/libmpdemux/url.c	Sat Nov 08 00:09:15 2003 +0000
+++ b/libmpdemux/url.c	Sat Nov 08 00:26:51 2003 +0000
@@ -43,7 +43,7 @@
 	if( ptr1==NULL ) {
 	        // Check for a special case: "sip:" (without "//"):
 	        if (strstr(url, "sip:") == url) {
-		        ptr1 = &url[3]; // points to ':'
+		        ptr1 = (char *)&url[3]; // points to ':'
 			jumpSize = 1;
 		} else {
 		        mp_msg(MSGT_NETWORK,MSGL_V,"Not an URL!\n");
--- a/libvo/vo_fbdev.c	Sat Nov 08 00:09:15 2003 +0000
+++ b/libvo/vo_fbdev.c	Sat Nov 08 00:26:51 2003 +0000
@@ -13,6 +13,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
+#include <ctype.h>
 
 #include <sys/mman.h>
 #include <sys/ioctl.h>
--- a/libvo/vo_fbdev2.c	Sat Nov 08 00:09:15 2003 +0000
+++ b/libvo/vo_fbdev2.c	Sat Nov 08 00:26:51 2003 +0000
@@ -4,6 +4,7 @@
  * (C) 2003
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
@@ -18,6 +19,7 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "fastmemcpy.h"
+#include "sub.h"
 #include "mp_msg.h"
 
 static vo_info_t info = {
--- a/loader/qtx/qtxsdk/components.h	Sat Nov 08 00:09:15 2003 +0000
+++ b/loader/qtx/qtxsdk/components.h	Sat Nov 08 00:26:51 2003 +0000
@@ -18,7 +18,7 @@
 typedef unsigned long                   UInt32;
 typedef signed long                     SInt32;
 
-#define FOUR_CHAR_CODE(x)       ((unsigned long)(x)) /* otherwise compiler will complain about values with high bit set */
+#define FOUR_CHAR_CODE(a,b,c,d)       ((unsigned long)(a)<<24 | (unsigned long)(b)<<16 | (unsigned long)(c)<<8 | (unsigned long)(d)) /* otherwise compiler will complain about values with high bit set */
 
 // codec private shit:
 typedef void *GlobalsPtr;
@@ -154,22 +154,22 @@
 
 /* values for PixMap.pixelFormat*/
 enum {
-    k16LE555PixelFormat         = FOUR_CHAR_CODE('L555'),       /* 16 bit LE rgb 555 (PC)*/
-    k16LE5551PixelFormat        = FOUR_CHAR_CODE('5551'),       /* 16 bit LE rgb 5551*/
-    k16BE565PixelFormat         = FOUR_CHAR_CODE('B565'),       /* 16 bit BE rgb 565*/
-    k16LE565PixelFormat         = FOUR_CHAR_CODE('L565'),       /* 16 bit LE rgb 565*/
-    k24BGRPixelFormat           = FOUR_CHAR_CODE('24BG'),       /* 24 bit bgr */
-    k32BGRAPixelFormat          = FOUR_CHAR_CODE('BGRA'),       /* 32 bit bgra    (Matrox)*/
-    k32ABGRPixelFormat          = FOUR_CHAR_CODE('ABGR'),       /* 32 bit abgr    */
-    k32RGBAPixelFormat          = FOUR_CHAR_CODE('RGBA'),       /* 32 bit rgba    */
-    kYUVSPixelFormat            = FOUR_CHAR_CODE('yuvs'),       /* YUV 4:2:2 byte ordering 16-unsigned = 'YUY2'*/
-    kYUVUPixelFormat            = FOUR_CHAR_CODE('yuvu'),       /* YUV 4:2:2 byte ordering 16-signed*/
-    kYVU9PixelFormat            = FOUR_CHAR_CODE('YVU9'),       /* YVU9 Planar    9*/
-    kYUV411PixelFormat          = FOUR_CHAR_CODE('Y411'),       /* YUV 4:1:1 Interleaved  16*/
-    kYVYU422PixelFormat         = FOUR_CHAR_CODE('YVYU'),       /* YVYU 4:2:2 byte ordering   16*/
-    kUYVY422PixelFormat         = FOUR_CHAR_CODE('UYVY'),       /* UYVY 4:2:2 byte ordering   16*/
-    kYUV211PixelFormat          = FOUR_CHAR_CODE('Y211'),       /* YUV 2:1:1 Packed   8*/
-    k2vuyPixelFormat            = FOUR_CHAR_CODE('2vuy')        /* UYVY 4:2:2 byte ordering   16*/
+    k16LE555PixelFormat         = FOUR_CHAR_CODE('L','5','5','5'),       /* 16 bit LE rgb 555 (PC)*/
+    k16LE5551PixelFormat        = FOUR_CHAR_CODE('5','5','5','1'),       /* 16 bit LE rgb 5551*/
+    k16BE565PixelFormat         = FOUR_CHAR_CODE('B','5','6','5'),       /* 16 bit BE rgb 565*/
+    k16LE565PixelFormat         = FOUR_CHAR_CODE('L','5','6','5'),       /* 16 bit LE rgb 565*/
+    k24BGRPixelFormat           = FOUR_CHAR_CODE('2','4','B','G'),       /* 24 bit bgr */
+    k32BGRAPixelFormat          = FOUR_CHAR_CODE('B','G','R','A'),       /* 32 bit bgra    (Matrox)*/
+    k32ABGRPixelFormat          = FOUR_CHAR_CODE('A','B','G','R'),       /* 32 bit abgr    */
+    k32RGBAPixelFormat          = FOUR_CHAR_CODE('R','G','B','A'),       /* 32 bit rgba    */
+    kYUVSPixelFormat            = FOUR_CHAR_CODE('y','u','v','s'),       /* YUV 4:2:2 byte ordering 16-unsigned = 'YUY2'*/
+    kYUVUPixelFormat            = FOUR_CHAR_CODE('y','u','v','u'),       /* YUV 4:2:2 byte ordering 16-signed*/
+    kYVU9PixelFormat            = FOUR_CHAR_CODE('Y','V','U','9'),       /* YVU9 Planar    9*/
+    kYUV411PixelFormat          = FOUR_CHAR_CODE('Y','4','1','1'),       /* YUV 4:1:1 Interleaved  16*/
+    kYVYU422PixelFormat         = FOUR_CHAR_CODE('Y','V','Y','U'),       /* YVYU 4:2:2 byte ordering   16*/
+    kUYVY422PixelFormat         = FOUR_CHAR_CODE('U','Y','V','Y'),       /* UYVY 4:2:2 byte ordering   16*/
+    kYUV211PixelFormat          = FOUR_CHAR_CODE('Y','2','1','1'),       /* YUV 2:1:1 Packed   8*/
+    k2vuyPixelFormat            = FOUR_CHAR_CODE('2','v','u','y')        /* UYVY 4:2:2 byte ordering   16*/
 };
 
 struct __attribute__((__packed__)) PixMapExtension {
--- a/m_option.c	Sat Nov 08 00:09:15 2003 +0000
+++ b/m_option.c	Sat Nov 08 00:26:51 2003 +0000
@@ -11,6 +11,7 @@
 #include "m_option.h"
 //#include "m_config.h"
 #include "mp_msg.h"
+#include "libmpdemux/url.h"
 
 // Don't free for 'production' atm
 #ifndef MP_DEBUG