[Mplayer-cvslog] CVS: main/libvo aclib.c,1.8,1.9 font_load_ft.c,1.4,1.5 geometry.c,1.1,1.2 mga_common.c,1.48,1.49 sub.c,1.56,1.57 vo_dga.c,1.58,1.59 vo_dxr3.c,1.108,1.109 vo_gif89a.c,1.6,1.7 vo_gl2.c,1.26,1.27 vo_null.c,1.10,1.11 vo_sdl.c,1.93,1.94 vo_tdfxfb.c,1.20,1.21 vo_xvidix.c,1.53,1.54 vosub_vidix.h,1.9,1.10 x11_common.c,1.110,1.111
Arpi of Ize
arpi at mplayerhq.hu
Thu Nov 7 00:54:31 CET 2002
Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv16361/libvo
Modified Files:
aclib.c font_load_ft.c geometry.c mga_common.c sub.c vo_dga.c
vo_dxr3.c vo_gif89a.c vo_gl2.c vo_null.c vo_sdl.c vo_tdfxfb.c
vo_xvidix.c vosub_vidix.h x11_common.c
Log Message:
*HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik at rangers.eu.org>
Index: aclib.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/aclib.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aclib.c 22 Aug 2002 23:28:33 -0000 1.8
+++ aclib.c 6 Nov 2002 23:54:27 -0000 1.9
@@ -9,6 +9,7 @@
*/
#include <stddef.h>
#include "../cpudetect.h"
+#include "fastmemcpy.h"
#define BLOCK_SIZE 4096
#define CONFUSION_FACTOR 0
@@ -177,6 +178,7 @@
#endif
#endif //!RUNTIME_CPUDETECT
+ return to;
}
#endif /* use fastmemcpy */
Index: font_load_ft.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/font_load_ft.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- font_load_ft.c 29 Aug 2002 21:09:48 -0000 1.4
+++ font_load_ft.c 6 Nov 2002 23:54:27 -0000 1.5
@@ -732,7 +732,7 @@
int inbytesleft = 1;
int outbytesleft = sizeof(FT_ULong);
- size_t count = iconv(*cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+ iconv(*cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
/* convert unicode BigEndian -> MachineEndian */
o = be2me_32(o);
@@ -785,7 +785,9 @@
}
static int prepare_charset_unicode(FT_Face face, FT_ULong *charset, FT_ULong *charcodes) {
+#ifdef HAVE_FREETYPE21
FT_ULong charcode;
+#endif
FT_UInt gindex;
int i,j;
Index: geometry.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/geometry.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geometry.c 23 Oct 2002 16:52:54 -0000 1.1
+++ geometry.c 6 Nov 2002 23:54:27 -0000 1.2
@@ -2,7 +2,9 @@
#include "geometry.h"
#include "../mp_msg.h"
+// #include "../mplayer.h" /* exit_player() */
#include <string.h>
+#include <stdlib.h> /* strtol */
/* A string of the form xpos[%]:ypos[%] */
char *vo_geometry = NULL;
@@ -53,7 +55,7 @@
return geometry_error();
}
- if(*colpos != '\0')
+ if(*colpos != '\0') {
if(vo_geometry[glen - 1] == '%') {
if(!get_num(colpos + 1, &yper, vo_geometry + glen - 1))
return geometry_error();
@@ -61,6 +63,7 @@
if(!get_num(colpos + 1, ypos, vo_geometry + glen))
return geometry_error();
}
+ }
if(xper)
*xpos = (scrw - vidw) * ((float)xper / 100.0);
Index: mga_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mga_common.c 1 Nov 2002 00:21:45 -0000 1.48
+++ mga_common.c 6 Nov 2002 23:54:27 -0000 1.49
@@ -16,7 +16,10 @@
static uint8_t *vid_data, *frames[4];
static int f = -1;
-static uint32_t drwX,drwY,drwWidth,drwHeight,drwBorderWidth,drwDepth;
+static uint32_t drwX,drwY,drwWidth,drwHeight;
+#ifdef VO_XMGA
+static uint32_t drwBorderWidth,drwDepth;
+#endif
static uint32_t drwcX,drwcY,dwidth,dheight;
static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
@@ -324,7 +327,7 @@
case VOCTRL_SET_PANSCAN:
if ( vo_fs && ( vo_panscan != vo_panscan_amount ) ) // || ( !vo_fs && vo_panscan_amount ) )
{
- int old_y = vo_panscan_y;
+// int old_y = vo_panscan_y;
panscan_calc();
// if ( old_y != vo_panscan_y )
set_window();
Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sub.c 6 Oct 2002 17:40:51 -0000 1.56
+++ sub.c 6 Nov 2002 23:54:27 -0000 1.57
@@ -4,6 +4,10 @@
#include <string.h>
#include "config.h"
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+
#include "mp_msg.h"
#include "video_out.h"
#include "font_load.h"
@@ -434,7 +438,6 @@
inline static void vo_update_spudec_sub(mp_osd_obj_t* obj, int dxs, int dys)
{
unsigned int bbox[4];
- int i;
spudec_calc_bbox(vo_spudec, dxs, dys, bbox);
obj->bbox.x1 = bbox[0];
obj->bbox.x2 = bbox[1];
Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- vo_dga.c 3 Nov 2002 15:14:36 -0000 1.58
+++ vo_dga.c 6 Nov 2002 23:54:27 -0000 1.59
@@ -246,9 +246,6 @@
static int vo_dga_src_offset=0; // offset in src
static int vo_dga_vp_offset=0; // offset in dest
static int vo_dga_bytes_per_line; // bytes per line to copy
-static int vo_dga_src_skip; // bytes to skip after copying one
- // line
- // (not supported yet) in src
static int vo_dga_vp_skip; // dto. for dest
static int vo_dga_lines; // num of lines to copy
static int vo_dga_hw_mode = 0; // index in mode list that is actually
@@ -333,7 +330,6 @@
static uint32_t draw_frame( uint8_t *src[] ){
int vp_skip = vo_dga_vp_skip;
- int lpl = vo_dga_bytes_per_line >> 2;
int numlines = vo_dga_lines;
char *s, *d;
@@ -366,7 +362,6 @@
case VDM_CONV_15TO16:
{
int i;
- char *e;
for(i=0; i< vo_dga_lines; i++){
rgb15to16( s, d, vo_dga_bytes_per_line);
d+=vo_dga_bytes_per_line;
@@ -400,7 +395,7 @@
static void check_events(void)
{
- int e=vo_x11_check_events(mDisplay);
+ vo_x11_check_events(mDisplay);
}
//---------------------------------------------------------
Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- vo_dxr3.c 3 Nov 2002 20:59:04 -0000 1.108
+++ vo_dxr3.c 6 Nov 2002 23:54:27 -0000 1.109
@@ -108,9 +108,11 @@
#include <stdio.h>
#include <time.h>
#include <math.h>
-#include <malloc.h>
#include "config.h"
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
#include "fastmemcpy.h"
#include "video_out.h"
Index: vo_gif89a.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gif89a.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vo_gif89a.c 22 Sep 2002 18:43:53 -0000 1.6
+++ vo_gif89a.c 6 Nov 2002 23:54:27 -0000 1.7
@@ -120,6 +120,9 @@
return &vo_info;
}
+/* forward declaration */
+int gif_reduce(int width, int height, unsigned char *source, unsigned char *destination, unsigned char *palette);
+
static uint32_t draw_frame(uint8_t * src[])
{
uint8_t *use_data;
Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- vo_gl2.c 29 Oct 2002 20:27:47 -0000 1.26
+++ vo_gl2.c 6 Nov 2002 23:54:27 -0000 1.27
@@ -15,6 +15,7 @@
#include "config.h"
#include "video_out.h"
#include "video_out_internal.h"
+#include "sub.h"
LIBVO_EXTERN(gl2)
@@ -61,14 +62,6 @@
//static int texture_id=1;
static GLXContext wsGLXContext;
-static int wsGLXAttrib[] = { GLX_RGBA,
- GLX_RED_SIZE,1,
- GLX_GREEN_SIZE,1,
- GLX_BLUE_SIZE,1,
- GLX_ALPHA_SIZE,0,
- GLX_DOUBLEBUFFER,
- None };
-
static uint32_t image_width;
static uint32_t image_height;
@@ -606,7 +599,7 @@
template.screen = scr;
vi_list = XGetVisualInfo(dpy, VisualScreenMask, &template, &vi_num);
if (!vi_list) return -1;
- best_weight = 1000000;
+ best_weight = 1000000; best_i=0;
for (i = 0; i < vi_num; i++) {
int val, res, w = 0;
/* of course, the visual must support OpenGL rendering... */
Index: vo_null.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_null.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vo_null.c 28 Aug 2002 21:32:32 -0000 1.10
+++ vo_null.c 6 Nov 2002 23:54:27 -0000 1.11
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <errno.h>
#include "config.h"
#include "video_out.h"
Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- vo_sdl.c 2 Nov 2002 18:56:16 -0000 1.93
+++ vo_sdl.c 6 Nov 2002 23:54:27 -0000 1.94
@@ -1139,8 +1139,6 @@
{
struct sdl_priv_s *priv = &sdl_priv;
uint8_t *dst;
- uint8_t *src;
- int i;
SDL_OVR_LOCK(-1)
@@ -1195,7 +1193,6 @@
struct sdl_priv_s *priv = &sdl_priv;
SDL_Event event;
SDLKey keypressed = 0;
- static int modifiers = 0;
/* Poll the waiting SDL Events */
while ( SDL_PollEvent(&event) ) {
Index: vo_tdfxfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_tdfxfb.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vo_tdfxfb.c 23 Oct 2002 16:52:54 -0000 1.20
+++ vo_tdfxfb.c 6 Nov 2002 23:54:27 -0000 1.21
@@ -43,6 +43,7 @@
#include "video_out_internal.h"
#include "drivers/3dfx.h"
#include "aspect.h"
+#include "sub.h"
LIBVO_EXTERN(tdfxfb)
Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- vo_xvidix.c 27 Oct 2002 03:16:21 -0000 1.53
+++ vo_xvidix.c 6 Nov 2002 23:54:27 -0000 1.54
@@ -195,7 +195,7 @@
uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
XVisualInfo vinfo;
- XSizeHints hint;
+// XSizeHints hint;
XSetWindowAttributes xswa;
unsigned long xswamask;
XWindowAttributes attribs;
Index: vosub_vidix.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vosub_vidix.h 28 Aug 2002 21:32:32 -0000 1.9
+++ vosub_vidix.h 6 Nov 2002 23:54:27 -0000 1.10
@@ -21,6 +21,7 @@
int vidix_start(void);
int vidix_stop(void);
void vidix_term( void );
+uint32_t vidix_control(uint32_t request, void *data, ...);
uint32_t vidix_query_fourcc(unsigned fourcc);
uint32_t vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y);
Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- x11_common.c 4 Nov 2002 08:21:46 -0000 1.110
+++ x11_common.c 6 Nov 2002 23:54:28 -0000 1.111
@@ -1103,6 +1103,7 @@
else if (!strcasecmp(name, "contrast")) *value = vo_contrast;
else if (!strcasecmp(name, "gamma")) *value = vo_gamma;
else return VO_NOTIMPL;
+ return VO_TRUE;
}
More information about the MPlayer-cvslog
mailing list