[MPlayer-dev-eng] [PATCH] a few more warnings

[Dominik 'Rathann' Mierzejewski]

Hi,

This fixes:
mplayer.c:2758: warning: implicit declaration of function `mpcodecs_config_vo'

demux_lavf.c: In function `demux_open_lavf':
demux_lavf.c:245: warning: enumeration value `CODEC_TYPE_UNKNOWN' not handled in switch
demux_lavf.c:245: warning: enumeration value `CODEC_TYPE_DATA' not handled in switch

muxer_lavf.c: In function `fix_parameters':
muxer_lavf.c:158: warning: implicit declaration of function `codec_get_wav_id'
muxer_lavf.c:159: warning: implicit declaration of function `codec_get_wav_tag'
muxer_lavf.c:169: warning: implicit declaration of function `codec_get_bmp_id'
muxer_lavf.c: In function `muxer_init_muxer_lavf':
muxer_lavf.c:301: warning: assignment from incompatible pointer type

geometry.c: In function `geometry':
geometry.c:36: warning: char format, different type arg (arg 5)
geometry.c:39: warning: char format, different type arg (arg 5)
geometry.c:48: warning: char format, different type arg (arg 4)

Regards,
R.

-- 
MPlayer RPMs maintainer: http://rpm.greysector.net/mplayer/
"I am Grey. I stand between the candle and the star. We are Grey.
 We stand between the darkness ... and the light."
        -- Delenn in Grey Council in Babylon 5:"Babylon Squared"
-------------- next part --------------
--- MPlayer-20050228/libmpcodecs/vd.h.warn	2004-03-16 20:49:42.000000000 +0100
+++ MPlayer-20050228/libmpcodecs/vd.h	2005-02-28 01:34:50.000000000 +0100
@@ -1,3 +1,5 @@
+#ifndef _VD_H
+#define _VD_H
 
 #include "mp_image.h"
 #include "mpc_info.h"
@@ -31,3 +33,5 @@
 void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w,int h, int x, int y);
 
 #define VDFLAGS_DROPFRAME 3
+
+#endif // _VD_H
--- MPlayer-20050228/libmpdemux/demux_lavf.c.warn	2005-02-28 01:17:13.000000000 +0100
+++ MPlayer-20050228/libmpdemux/demux_lavf.c	2005-02-28 01:34:50.000000000 +0100
@@ -240,6 +240,8 @@
             demuxer->video->id=i;
             demuxer->video->sh= demuxer->v_streams[i];            
             break;}
+        default:
+	    mp_msg(MSGT_HEADER,MSGL_WARN,"LAVF: unknown stream type\n");
         }
     }
     
--- MPlayer-20050228/libmpdemux/muxer_lavf.c.warn	2005-02-22 00:16:12.000000000 +0100
+++ MPlayer-20050228/libmpdemux/muxer_lavf.c	2005-02-28 02:39:26.000000000 +0100
@@ -17,6 +17,7 @@
 #include "stheader.h"
 #include "../m_option.h"
 #include "avformat.h"
+#include "avi.h"
 
 typedef struct {
 	//AVInputFormat *avif;
@@ -145,7 +146,7 @@
 }
 
 
-static void fix_parameters(muxer_stream_t *stream, void *sh)
+static void fix_parameters(muxer_stream_t *stream)
 {
 	muxer_stream_priv_t *spriv = (muxer_stream_priv_t *) stream->priv;
 	AVCodecContext *ctx;
--- MPlayer-20050228/libvo/geometry.c.warn	2005-02-28 03:19:05.000000000 +0100
+++ MPlayer-20050228/libvo/geometry.c	2005-02-28 03:19:21.000000000 +0100
@@ -33,10 +33,10 @@
 		  {
 		   char percent[2];
 		   RESET_GEOMETRY
-		   if(sscanf(vo_geometry, "%i%%:%i%1[%]", &xper, &yper, &percent) != 3)
+		   if(sscanf(vo_geometry, "%i%%:%i%1[%]", &xper, &yper, percent) != 3)
 		   {
 		    RESET_GEOMETRY
-		    if(sscanf(vo_geometry, "%i:%i%1[%]", &xoff, &yper, &percent) != 3)
+		    if(sscanf(vo_geometry, "%i:%i%1[%]", &xoff, &yper, percent) != 3)
 		    {
 		     RESET_GEOMETRY
 		     if(sscanf(vo_geometry, "%i%%:%i", &xper, &yoff) != 2)
@@ -45,7 +45,7 @@
 		     if(sscanf(vo_geometry, "%i:%i", &xoff, &yoff) != 2)
 		     {
 		      RESET_GEOMETRY
-		      if(sscanf(vo_geometry, "%i%1[%]", &xper, &percent) != 2)
+		      if(sscanf(vo_geometry, "%i%1[%]", &xper, percent) != 2)
 		      {
 			mp_msg(MSGT_VO, MSGL_ERR,
 			    "-geometry must be in [WxH][+X+Y] | [X[%%]:[Y[%%]]] format, incorrect (%s)\n", vo_geometry);
--- MPlayer-20050228/mplayer.c.warn	2005-02-28 01:16:59.000000000 +0100
+++ MPlayer-20050228/mplayer.c	2005-02-28 02:16:06.000000000 +0100
@@ -180,6 +180,7 @@
 #include "libmpcodecs/dec_video.h"
 #include "libmpcodecs/mp_image.h"
 #include "libmpcodecs/vf.h"
+#include "libmpcodecs/vd.h"
 
 extern void vf_list_plugins();