[MPlayer-cvslog] r18981 - in trunk: Gui/mplayer/common.c Gui/mplayer/gtk/fs.c Gui/mplayer/gtk/opts.c Gui/mplayer/mw.c Gui/skin/font.c libao2/ao_esd.c libmpcodecs/pullup.c libmpcodecs/vd_theora.c libmpcodecs/ve_lavc.c libmpcodecs/vf_detc.c libmpcodecs/vf_harddup.c libmpcodecs/vf_kerndeint.c libmpcodecs/vf_remove_logo.c libmpcodecs/vf_uspp.c libvo/vo_dga.c libvo/vo_x11.c vidix/drivers/cyberblade_vid.c
diego
subversion at mplayerhq.hu
Sun Jul 9 18:01:37 CEST 2006
Author: diego
Date: Sun Jul 9 18:01:36 2006
New Revision: 18981
Modified:
trunk/Gui/mplayer/common.c
trunk/Gui/mplayer/gtk/fs.c
trunk/Gui/mplayer/gtk/opts.c
trunk/Gui/mplayer/mw.c
trunk/Gui/skin/font.c
trunk/libao2/ao_esd.c
trunk/libmpcodecs/pullup.c
trunk/libmpcodecs/vd_theora.c
trunk/libmpcodecs/ve_lavc.c
trunk/libmpcodecs/vf_detc.c
trunk/libmpcodecs/vf_harddup.c
trunk/libmpcodecs/vf_kerndeint.c
trunk/libmpcodecs/vf_remove_logo.c
trunk/libmpcodecs/vf_uspp.c
trunk/libvo/vo_dga.c
trunk/libvo/vo_x11.c
trunk/vidix/drivers/cyberblade_vid.c
Log:
Remove unused variables, patch by Stefan Huehner, stefan ##at## huehner org.
Modified: trunk/Gui/mplayer/common.c
==============================================================================
--- trunk/Gui/mplayer/common.c (original)
+++ trunk/Gui/mplayer/common.c Sun Jul 9 18:01:36 2006
@@ -242,7 +242,7 @@
{
wItem * item;
txSample * image = NULL;
- int i, type;
+ int i;
image_buffer=db;
image_width=window->Width;
Modified: trunk/Gui/mplayer/gtk/fs.c
==============================================================================
--- trunk/Gui/mplayer/gtk/fs.c (original)
+++ trunk/Gui/mplayer/gtk/fs.c Sun Jul 9 18:01:36 2006
@@ -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;
Modified: trunk/Gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/Gui/mplayer/gtk/opts.c (original)
+++ trunk/Gui/mplayer/gtk/opts.c Sun Jul 9 18:01:36 2006
@@ -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;
Modified: trunk/Gui/mplayer/mw.c
==============================================================================
--- trunk/Gui/mplayer/mw.c (original)
+++ trunk/Gui/mplayer/mw.c Sun Jul 9 18:01:36 2006
@@ -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 );
Modified: trunk/Gui/skin/font.c
==============================================================================
--- trunk/Gui/skin/font.c (original)
+++ trunk/Gui/skin/font.c Sun Jul 9 18:01:36 2006
@@ -148,11 +148,10 @@
txSample * fntRender( wItem * item,int px,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;
Modified: trunk/libao2/ao_esd.c
==============================================================================
--- trunk/libao2/ao_esd.c (original)
+++ trunk/libao2/ao_esd.c Sun Jul 9 18:01:36 2006
@@ -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;
Modified: trunk/libmpcodecs/pullup.c
==============================================================================
--- trunk/libmpcodecs/pullup.c (original)
+++ trunk/libmpcodecs/pullup.c Sun Jul 9 18:01:36 2006
@@ -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++)
Modified: trunk/libmpcodecs/vd_theora.c
==============================================================================
--- trunk/libmpcodecs/vd_theora.c (original)
+++ trunk/libmpcodecs/vd_theora.c Sun Jul 9 18:01:36 2006
@@ -142,7 +142,6 @@
ogg_packet op;
yuv_buffer yuv;
mp_image_t* mpi;
- int i;
memset (&op, 0, sizeof (op));
op.bytes = len;
Modified: trunk/libmpcodecs/ve_lavc.c
==============================================================================
--- trunk/libmpcodecs/ve_lavc.c (original)
+++ trunk/libmpcodecs/ve_lavc.c Sun Jul 9 18:01:36 2006
@@ -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){
Modified: trunk/libmpcodecs/vf_detc.c
==============================================================================
--- trunk/libmpcodecs/vf_detc.c (original)
+++ trunk/libmpcodecs/vf_detc.c Sun Jul 9 18:01:36 2006
@@ -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;
Modified: trunk/libmpcodecs/vf_harddup.c
==============================================================================
--- trunk/libmpcodecs/vf_harddup.c (original)
+++ trunk/libmpcodecs/vf_harddup.c Sun Jul 9 18:01:36 2006
@@ -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;
Modified: trunk/libmpcodecs/vf_kerndeint.c
==============================================================================
--- trunk/libmpcodecs/vf_kerndeint.c (original)
+++ trunk/libmpcodecs/vf_kerndeint.c Sun Jul 9 18:01:36 2006
@@ -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;
Modified: trunk/libmpcodecs/vf_remove_logo.c
==============================================================================
--- trunk/libmpcodecs/vf_remove_logo.c (original)
+++ trunk/libmpcodecs/vf_remove_logo.c Sun Jul 9 18:01:36 2006
@@ -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;
Modified: trunk/libmpcodecs/vf_uspp.c
==============================================================================
--- trunk/libmpcodecs/vf_uspp.c (original)
+++ trunk/libmpcodecs/vf_uspp.c Sun Jul 9 18:01:36 2006
@@ -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];
Modified: trunk/libvo/vo_dga.c
==============================================================================
--- trunk/libvo/vo_dga.c (original)
+++ trunk/libvo/vo_dga.c Sun Jul 9 18:01:36 2006
@@ -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;
Modified: trunk/libvo/vo_x11.c
==============================================================================
--- trunk/libvo/vo_x11.c (original)
+++ trunk/libvo/vo_x11.c Sun Jul 9 18:01:36 2006
@@ -383,7 +383,6 @@
if (WinID)
{
int border;
- Window win;
XUnmapWindow(mDisplay, vo_window);
XChangeWindowAttributes(mDisplay, vo_window, xswamask,
&xswa);
Modified: trunk/vidix/drivers/cyberblade_vid.c
==============================================================================
--- trunk/vidix/drivers/cyberblade_vid.c (original)
+++ trunk/vidix/drivers/cyberblade_vid.c Sun Jul 9 18:01:36 2006
@@ -488,7 +488,6 @@
if(CRINB(0xd1)&0x80)
{
- int hcorr,vcorr;
int TVHTotal,TVVTotal,TVHSyncStart,TVVSyncStart,TVOverflow;
LOGWRITE("[cyberblade] Using TV-CRTC\n");
More information about the MPlayer-cvslog
mailing list