[MPlayer-dev-eng] [patch] remove more unused variables

Stefan Huehner stefan at huehner.org
Sun Jul 9 17:06:57 CEST 2006


Hi,

attached patch removes some more unused variables.

Regards,
Stefan

-------------- next part --------------
diff -u Gui/skin/font.c Gui/skin/font.c
--- Gui/skin/font.c	(working copy)
+++ Gui/skin/font.c	(working copy)
@@ -148,11 +148,10 @@
 
 txSample * fntRender( wItem * item,int px,const char * fmt,... )
 {
- txSample      * tmp = NULL;
  va_list         ap;
  unsigned char   p[512];
  unsigned int    c;
- int 	         i, dx = 0, s, tw, fbw, iw, id, ofs;
+ int 	         i, dx = 0, tw, fbw, iw, id, ofs;
  int 		 x,y,fh,fw,fyc,yc;
  uint32_t      * ibuf;
  uint32_t      * obuf;
diff -u Gui/mplayer/mw.c Gui/mplayer/mw.c
--- Gui/mplayer/mw.c	(working copy)
+++ Gui/mplayer/mw.c	(working copy)
@@ -53,9 +53,6 @@
 
 void mplMainDraw( void )
 {
- wItem    * item;
- txSample * image = NULL;
- int        i, type;
 
  if ( appMPlayer.mainWindow.State == wsWindowClosed ) exit_player( MSGTR_Exit_quit );
  
--- Gui/mplayer/gtk/fs.c	(revision 18975)
+++ Gui/mplayer/gtk/fs.c	(working copy)
@@ -321,7 +321,6 @@
  
  if ( fsTopList_items ) g_list_free( fsTopList_items ); fsTopList_items=NULL;
  {
-  char * hist;
   int  i, c = 1;
   
   if ( fsType == fsVideoSelector )
@@ -562,19 +561,11 @@
 
 GtkWidget * create_FileSelect( void )
 {
- GtkWidget     * FSFrame;
- GtkWidget     * frame2;
- GtkWidget     * frame3;
- GtkWidget     * frame4;
  GtkWidget     * vbox4;
  GtkWidget     * hbox4;
  GtkWidget     * vseparator1;
- GtkWidget     * hseparator1;
  GtkWidget     * hbox6;
  GtkWidget     * fsFNameListWindow;
- GtkWidget     * label1;
- GtkWidget     * hseparator2;
- GtkWidget     * hseparator3;
  GtkWidget     * hbuttonbox3;
 
  GtkWidget     * uppixmapwid;
--- Gui/mplayer/gtk/opts.c	(revision 18975)
+++ Gui/mplayer/gtk/opts.c	(working copy)
@@ -761,7 +761,6 @@
   GtkWidget * hbox1;
   GtkWidget * vbox2;
   GtkWidget * scrolledwindow3;
-  GtkWidget * hbuttonbox2;
   GtkWidget * vbox3;
   GtkWidget * hbox8;
   GtkWidget * hbox2;
@@ -769,7 +768,6 @@
   GtkWidget * scrolledwindow2;
   GtkWidget * hbuttonbox3;
   GtkWidget * vbox5;
-  GtkWidget * hbox3;
   GtkWidget * vbox6;
   GtkWidget * vbox600;
   GSList    * OSD_group = NULL;
--- Gui/mplayer/common.c	(revision 18975)
+++ Gui/mplayer/common.c	(working copy)
@@ -242,7 +242,7 @@
 {
  wItem    * item;
  txSample * image = NULL;
- int        i, type;
+ int        i;
 
  image_buffer=db;
  image_width=window->Width;
--- libmpcodecs/pullup.c	(revision 18975)
+++ libmpcodecs/pullup.c	(working copy)
@@ -608,7 +608,6 @@
 static void print_aff_and_breaks(struct pullup_context *c, struct pullup_field *f)
 {
 	int i;
-	int max_l, max_r, l;
 	struct pullup_field *f0 = f;
 	const char aff_l[] = "+..", aff_r[] = "..+";
 	printf("\naffinity: ");
@@ -698,7 +697,6 @@
 void pullup_pack_frame(struct pullup_context *c, struct pullup_frame *fr)
 {
 	int i;
-	int par = fr->parity;
 	if (fr->buffer) return;
 	if (fr->length < 2) return; /* FIXME: deal with this */
 	for (i = 0; i < 2; i++)
--- libmpcodecs/vd_theora.c	(revision 18975)
+++ libmpcodecs/vd_theora.c	(working copy)
@@ -142,7 +142,6 @@
    ogg_packet op;
    yuv_buffer yuv;
    mp_image_t* mpi;
-   int i;
 
    memset (&op, 0, sizeof (op));
    op.bytes = len;
--- libmpcodecs/vf_kerndeint.c	(revision 18975)
+++ libmpcodecs/vf_kerndeint.c	(working copy)
@@ -91,7 +91,6 @@
 	int n = vf->priv->frame++;
 	int val, hi, lo, w, h;
 	double valf;
-	unsigned int hint;
 	int plane;
 	int threshold = vf->priv->thresh;
 	int order = vf->priv->order;
@@ -289,8 +288,6 @@
 }
 
 static int open(vf_instance_t *vf, char* args){
-        double LumSpac, LumTmp, ChromSpac, ChromTmp;
-        double Param1, Param2, Param3;
 
 	vf->config=config;
 	vf->put_image=put_image;
--- libmpcodecs/vf_remove_logo.c	(revision 18975)
+++ libmpcodecs/vf_remove_logo.c	(working copy)
@@ -535,8 +535,6 @@
  */
 pgm_structure * load_pgm(const char * file_name)
 {
-  unsigned char flags;
-  int x, y;
   int maximum_greyscale_value;
   FILE * input;
   int pnm_number;
--- libmpcodecs/vf_uspp.c	(revision 18975)
+++ libmpcodecs/vf_uspp.c	(working copy)
@@ -177,7 +177,7 @@
     for(i=0; i<count; i++){
         const int x1= offset[i+count-1][0];
         const int y1= offset[i+count-1][1];
-        int offset, out_size, got_picture;
+        int offset, out_size;
         p->frame->data[0]= p->src[0] + x1 + y1 * p->frame->linesize[0];
         p->frame->data[1]= p->src[1] + x1/2 + y1/2 * p->frame->linesize[1];
         p->frame->data[2]= p->src[2] + x1/2 + y1/2 * p->frame->linesize[2];
--- libmpcodecs/ve_lavc.c	(revision 18975)
+++ libmpcodecs/ve_lavc.c	(working copy)
@@ -911,10 +911,6 @@
     if(lavc_param_psnr){
         static FILE *fvstats=NULL;
         char filename[20];
-        static long long int all_len=0;
-        static int frame_number=0;
-        static double all_frametime=0.0;
-        AVFrame *pic= lavc_venc_context->coded_frame;
         double f= lavc_venc_context->width*lavc_venc_context->height*255.0*255.0;
 	double quality=0.0;
 	int8_t *q;
@@ -970,7 +966,6 @@
 }
 
 static void uninit(struct vf_instance_s* vf){
-    const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'};
     
 #if LIBAVCODEC_BUILD >= 4643
     if(lavc_param_psnr){
--- libmpcodecs/vf_harddup.c	(revision 18975)
+++ libmpcodecs/vf_harddup.c	(working copy)
@@ -18,7 +18,6 @@
 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
 {
 	mp_image_t *dmpi;
-	int ret;
 
 	vf->priv->last_mpi = mpi;
 	
--- libmpcodecs/vf_detc.c	(revision 18975)
+++ libmpcodecs/vf_detc.c	(working copy)
@@ -177,7 +177,6 @@
 
 static int analyze_aggressive(struct vf_priv_s *p, mp_image_t *new, mp_image_t *old)
 {
-	int i;
 	struct metrics m, pm;
 	
 	if (p->frame >= 0) p->frame = (p->frame+1)%5;
--- libfaad2/sbr_hfadj.c	(revision 18975)
+++ libfaad2/sbr_hfadj.c	(working copy)
@@ -1170,7 +1170,6 @@
             real_t den = 0;
             real_t acc1 = 0;
             real_t acc2 = 0;
-            uint8_t current_res_band_size = 0;
 
             uint8_t ml1, ml2;
 
--- tremor/floor0.c	(revision 18975)
+++ tremor/floor0.c	(working copy)
@@ -343,7 +343,6 @@
 static vorbis_look_floor *floor0_look (vorbis_dsp_state *vd,vorbis_info_mode *mi,
                               vorbis_info_floor *i){
   int j;
-  ogg_int32_t scale; 
   vorbis_info        *vi=vd->vi;
   codec_setup_info   *ci=(codec_setup_info *)vi->codec_setup;
   vorbis_info_floor0 *info=(vorbis_info_floor0 *)i;
--- libao2/ao_esd.c	(revision 18975)
+++ libao2/ao_esd.c	(working copy)
@@ -298,8 +298,7 @@
     int offs;
     int nwritten;
     int nsamples;
-    int remainder, n;
-    int saved_fl;
+    int n;
 
     /* round down buffersize to a multiple of ESD_BUF_SIZE bytes */
     len = len / ESD_BUF_SIZE * ESD_BUF_SIZE;
--- vidix/drivers/cyberblade_vid.c	(revision 18975)
+++ vidix/drivers/cyberblade_vid.c	(working copy)
@@ -488,7 +488,6 @@
 
 		if(CRINB(0xd1)&0x80)
 		{
-			int hcorr,vcorr;
 			int TVHTotal,TVVTotal,TVHSyncStart,TVVSyncStart,TVOverflow;
 			LOGWRITE("[cyberblade] Using TV-CRTC\n");
 
--- libvo/vo_dga.c	(revision 18975)
+++ libvo/vo_dga.c	(working copy)
@@ -286,7 +286,6 @@
 static int draw_frame(uint8_t * src[])
 {
 
-    int vp_skip = vo_dga_vp_skip;
     int numlines = vo_dga_lines;
 
     char *s, *d;
--- libvo/vo_x11.c	(revision 18975)
+++ libvo/vo_x11.c	(working copy)
@@ -383,7 +383,6 @@
             if (WinID)
             {
                 int border;
-                Window win;
                 XUnmapWindow(mDisplay, vo_window);
                 XChangeWindowAttributes(mDisplay, vo_window, xswamask,
                                         &xswa);


More information about the MPlayer-dev-eng mailing list