[Mplayer-cvslog] CVS: main/libmpcodecs ad_a52.c,1.4,1.5 vd_ffmpeg.c,1.46,1.47 vd_real.c,1.11,1.12 vd_svq1.c,1.4,1.5 ve_divx4.c,1.5,1.6 ve_lavc.c,1.25,1.26 ve_libdv.c,1.2,1.3 ve_rawrgb.c,1.5,1.6 ve_vfw.c,1.5,1.6 vf.c,1.45,1.46 vf_lavc.c,1.4,1.5 vf_palette.c,1.4,1.5 vf_pp.c,1.8,1.9 vf_rectangle.c,1.2,1.3

Arpi of Ize arpi at mplayerhq.hu
Thu Aug 29 00:46:17 CEST 2002


Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv25343/libmpcodecs

Modified Files:
	ad_a52.c vd_ffmpeg.c vd_real.c vd_svq1.c ve_divx4.c ve_lavc.c 
	ve_libdv.c ve_rawrgb.c ve_vfw.c vf.c vf_lavc.c vf_palette.c 
	vf_pp.c vf_rectangle.c 
Log Message:
mostly compiler warning fixes, some small bugfix
patch by Dominik Mierzejewski <dominik at rangers.eu.org>


Index: ad_a52.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_a52.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ad_a52.c	1 Apr 2002 17:57:51 -0000	1.4
+++ ad_a52.c	28 Aug 2002 22:45:44 -0000	1.5
@@ -186,7 +186,7 @@
 		mp_msg(MSGT_DECAUDIO,MSGL_WARN,"a52: error at resampling\n");
 		break;
 	    }
-	    len+=2*a52_resample(a52_samples,&buf[len]);
+	    len+=2*a52_resample(a52_samples,(int16_t *)&buf[len]);
 	}
   return len;
 }

Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- vd_ffmpeg.c	28 Aug 2002 22:02:38 -0000	1.46
+++ vd_ffmpeg.c	28 Aug 2002 22:45:44 -0000	1.47
@@ -258,7 +258,7 @@
         }
     }else
 #endif
-        mpcodecs_draw_slice (sh,src, stride, width, height, 0, y);
+        mpcodecs_draw_slice (sh,(unsigned char*)src, stride, width, height, 0, y);
 }
 
 static int init_vo(sh_video_t *sh){

Index: vd_real.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_real.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vd_real.c	24 Aug 2002 23:06:38 -0000	1.11
+++ vd_real.c	28 Aug 2002 22:45:44 -0000	1.12
@@ -93,6 +93,11 @@
 }
 
 #ifdef USE_WIN32DLL
+
+#include "../loader/ldt_keeper.h"
+void* LoadLibraryA(char* name);
+void* GetProcAddress(void* handle,char* func);
+
 int load_syms_windows(char *path) {
     void *handle;
     Setup_LDT_Keeper();

Index: vd_svq1.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_svq1.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vd_svq1.c	23 Jun 2002 11:34:54 -0000	1.4
+++ vd_svq1.c	28 Aug 2002 22:45:44 -0000	1.5
@@ -17,6 +17,14 @@
 
 LIBVD_EXTERN(svq1)
 
+#ifdef USE_LIBAVCODEC
+#ifdef USE_LIBAVCODEC_SO
+#include <ffmpeg/avcodec.h>
+#else
+#include "libavcodec/avcodec.h"
+#endif
+#endif
+
 #include "native/svq1.h"
 
 // to set/get/query special features/parameters

Index: ve_divx4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_divx4.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ve_divx4.c	27 Apr 2002 01:17:42 -0000	1.5
+++ ve_divx4.c	28 Aug 2002 22:45:44 -0000	1.6
@@ -24,6 +24,7 @@
 
 extern int pass;
 extern char* passtmpfile;
+extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags);
 
 #include <encore2.h>
 
@@ -195,7 +196,7 @@
     vf->put_image=put_image;
     vf->priv=malloc(sizeof(struct vf_priv_s));
     memset(vf->priv,0,sizeof(struct vf_priv_s));
-    vf->priv->mux=args;
+    vf->priv->mux=(aviwrite_stream_t*)args;
 
     mux_v->bih=malloc(sizeof(BITMAPINFOHEADER));
     mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);

Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ve_lavc.c	25 Aug 2002 23:19:38 -0000	1.25
+++ ve_lavc.c	28 Aug 2002 22:45:44 -0000	1.26
@@ -26,6 +26,7 @@
 
 extern char* passtmpfile;
 extern int pass;
+extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags);
 
 //===========================================================================//
 
@@ -445,7 +446,7 @@
     vf->put_image=put_image;
     vf->priv=malloc(sizeof(struct vf_priv_s));
     memset(vf->priv,0,sizeof(struct vf_priv_s));
-    vf->priv->mux=args;
+    vf->priv->mux=(aviwrite_stream_t*)args;
 
     /* XXX: hack: some of the MJPEG decoder DLL's needs exported huffman
        table, so we define a zero-table, also lavc mjpeg encoder is putting

Index: ve_libdv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_libdv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ve_libdv.c	13 Apr 2002 19:14:31 -0000	1.2
+++ ve_libdv.c	28 Aug 2002 22:45:44 -0000	1.3
@@ -23,6 +23,8 @@
 
 #include <libdv/dv.h>
 
+extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags);
+
 #ifndef DV_WIDTH
 #define DV_WIDTH       720
 #define DV_PAL_HEIGHT  576

Index: ve_rawrgb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_rawrgb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ve_rawrgb.c	29 Apr 2002 09:53:30 -0000	1.5
+++ ve_rawrgb.c	28 Aug 2002 22:45:44 -0000	1.6
@@ -16,6 +16,8 @@
 #include "mp_image.h"
 #include "vf.h"
 
+extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags);
+
 //===========================================================================//
 
 struct vf_priv_s {
@@ -58,7 +60,7 @@
     vf->put_image=put_image;
     vf->priv=malloc(sizeof(struct vf_priv_s));
     memset(vf->priv,0,sizeof(struct vf_priv_s));
-    vf->priv->mux=args;
+    vf->priv->mux=(aviwrite_stream_t*)args;
     
     mux_v->bih=malloc(sizeof(BITMAPINFOHEADER));
     mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);

Index: ve_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_vfw.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ve_vfw.c	13 May 2002 21:18:52 -0000	1.5
+++ ve_vfw.c	28 Aug 2002 22:45:44 -0000	1.6
@@ -18,6 +18,8 @@
 #include "mp_image.h"
 #include "vf.h"
 
+extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags);
+
 //===========================================================================//
 
 #include "dll_init.h"
@@ -83,7 +85,7 @@
     vf->put_image=put_image;
     vf->priv=malloc(sizeof(struct vf_priv_s));
     memset(vf->priv,0,sizeof(struct vf_priv_s));
-    vf->priv->mux=args;
+    vf->priv->mux=(aviwrite_stream_t*)args;
 
     vfw_bih=malloc(sizeof(BITMAPINFOHEADER));
     vfw_bih->biSize=sizeof(BITMAPINFOHEADER);

Index: vf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- vf.c	21 Aug 2002 23:08:20 -0000	1.45
+++ vf.c	28 Aug 2002 22:45:44 -0000	1.46
@@ -2,11 +2,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "../config.h"
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
-#include "../config.h"
 #include "../mp_msg.h"
 #include "../help_mp.h"
 

Index: vf_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_lavc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vf_lavc.c	14 Aug 2002 21:43:49 -0000	1.4
+++ vf_lavc.c	28 Aug 2002 22:45:44 -0000	1.5
@@ -104,7 +104,7 @@
     vf->priv->pes.id=0x1E0;
     vf->priv->pes.timestamp=-1; // dunno
     
-    dmpi->planes[0]=&vf->priv->pes;
+    dmpi->planes[0]=(unsigned char*)&vf->priv->pes;
     
     vf_next_put_image(vf,dmpi);
 }

Index: vf_palette.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_palette.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vf_palette.c	21 Jun 2002 16:38:53 -0000	1.4
+++ vf_palette.c	28 Aug 2002 22:45:44 -0000	1.5
@@ -81,7 +81,7 @@
 	MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
 	mpi->w, mpi->h);
 
-    if(!mpi->planes[1]) mpi->planes[1]=gray_pal;
+    if(!mpi->planes[1]) mpi->planes[1]=(unsigned char*)gray_pal;
 
     if(mpi->w==mpi->stride[0] && dmpi->w*(dmpi->bpp>>3)==dmpi->stride[0]){
 	// no stride conversion needed

Index: vf_pp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_pp.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vf_pp.c	2 Aug 2002 22:55:54 -0000	1.8
+++ vf_pp.c	28 Aug 2002 22:45:44 -0000	1.9
@@ -98,7 +98,7 @@
     IMGFMT_YV12,
     IMGFMT_I420,
     IMGFMT_IYUV,
-    NULL
+    0
 };
 
 static int open(vf_instance_t *vf, char* args){

Index: vf_rectangle.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_rectangle.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vf_rectangle.c	4 Aug 2002 02:21:50 -0000	1.2
+++ vf_rectangle.c	28 Aug 2002 22:45:44 -0000	1.3
@@ -4,6 +4,8 @@
 #include "mp_image.h"
 #include "vf.h"
 
+#include "../libvo/fastmemcpy.h"
+
 struct vf_priv_s {
     int x, y, w, h;
 };




More information about the MPlayer-cvslog mailing list