summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-09 16:01:36 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-09 16:01:36 +0000
commite364249f21f7273f86d03264ec4d6d4957bd7dd5 (patch)
tree8c44cb7b9d1d67ba58f022cded15221175d5354f
parent4a3877c93ac469786ab704159b1a4744621daf73 (diff)
downloadmpv-e364249f21f7273f86d03264ec4d6d4957bd7dd5.tar.bz2
mpv-e364249f21f7273f86d03264ec4d6d4957bd7dd5.tar.xz
Remove unused variables, patch by Stefan Huehner, stefan ##at## huehner org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18981 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Gui/mplayer/common.c2
-rw-r--r--Gui/mplayer/gtk/fs.c9
-rw-r--r--Gui/mplayer/gtk/opts.c2
-rw-r--r--Gui/mplayer/mw.c3
-rw-r--r--Gui/skin/font.c3
-rw-r--r--libao2/ao_esd.c3
-rw-r--r--libmpcodecs/pullup.c2
-rw-r--r--libmpcodecs/vd_theora.c1
-rw-r--r--libmpcodecs/ve_lavc.c5
-rw-r--r--libmpcodecs/vf_detc.c1
-rw-r--r--libmpcodecs/vf_harddup.c1
-rw-r--r--libmpcodecs/vf_kerndeint.c3
-rw-r--r--libmpcodecs/vf_remove_logo.c2
-rw-r--r--libmpcodecs/vf_uspp.c2
-rw-r--r--libvo/vo_dga.c1
-rw-r--r--libvo/vo_x11.c1
-rw-r--r--vidix/drivers/cyberblade_vid.c1
17 files changed, 4 insertions, 38 deletions
diff --git a/Gui/mplayer/common.c b/Gui/mplayer/common.c
index 40477c7c7d..08ae701de0 100644
--- a/Gui/mplayer/common.c
+++ b/Gui/mplayer/common.c
@@ -242,7 +242,7 @@ void Render( wsTWindow * window,wItem * Items,int nrItems,char * db,int size )
{
wItem * item;
txSample * image = NULL;
- int i, type;
+ int i;
image_buffer=db;
image_width=window->Width;
diff --git a/Gui/mplayer/gtk/fs.c b/Gui/mplayer/gtk/fs.c
index 00796f1dd9..e84efad79b 100644
--- a/Gui/mplayer/gtk/fs.c
+++ b/Gui/mplayer/gtk/fs.c
@@ -321,7 +321,6 @@ void ShowFileSelect( int type,int modal )
if ( fsTopList_items ) g_list_free( fsTopList_items ); fsTopList_items=NULL;
{
- char * hist;
int i, c = 1;
if ( fsType == fsVideoSelector )
@@ -562,19 +561,11 @@ gboolean on_FileSelect_key_release_event( GtkWidget * widget,GdkEventKey * event
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;
diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c
index 4d0161fe44..d082b0d054 100644
--- a/Gui/mplayer/gtk/opts.c
+++ b/Gui/mplayer/gtk/opts.c
@@ -761,7 +761,6 @@ GtkWidget * create_Preferences( void )
GtkWidget * hbox1;
GtkWidget * vbox2;
GtkWidget * scrolledwindow3;
- GtkWidget * hbuttonbox2;
GtkWidget * vbox3;
GtkWidget * hbox8;
GtkWidget * hbox2;
@@ -769,7 +768,6 @@ GtkWidget * create_Preferences( void )
GtkWidget * scrolledwindow2;
GtkWidget * hbuttonbox3;
GtkWidget * vbox5;
- GtkWidget * hbox3;
GtkWidget * vbox6;
GtkWidget * vbox600;
GSList * OSD_group = NULL;
diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c
index 9c2062116e..7c188789da 100644
--- a/Gui/mplayer/mw.c
+++ b/Gui/mplayer/mw.c
@@ -53,9 +53,6 @@ int i,pot = 0;
void mplMainDraw( void )
{
- wItem * item;
- txSample * image = NULL;
- int i, type;
if ( appMPlayer.mainWindow.State == wsWindowClosed ) exit_player( MSGTR_Exit_quit );
diff --git a/Gui/skin/font.c b/Gui/skin/font.c
index 4743f100ab..c1d275dabd 100644
--- a/Gui/skin/font.c
+++ b/Gui/skin/font.c
@@ -148,11 +148,10 @@ int fntTextHeight( int id,char * str )
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;
diff --git a/libao2/ao_esd.c b/libao2/ao_esd.c
index 297787f6c8..83b52093d9 100644
--- a/libao2/ao_esd.c
+++ b/libao2/ao_esd.c
@@ -298,8 +298,7 @@ static int play(void* data, int len, int flags)
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;
diff --git a/libmpcodecs/pullup.c b/libmpcodecs/pullup.c
index 6f731ec826..ce73732f4c 100644
--- a/libmpcodecs/pullup.c
+++ b/libmpcodecs/pullup.c
@@ -608,7 +608,6 @@ static int decide_frame_length(struct pullup_context *c)
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 @@ static void copy_field(struct pullup_context *c, struct pullup_buffer *dest,
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++)
diff --git a/libmpcodecs/vd_theora.c b/libmpcodecs/vd_theora.c
index 6bf1248155..58321aa4f2 100644
--- a/libmpcodecs/vd_theora.c
+++ b/libmpcodecs/vd_theora.c
@@ -142,7 +142,6 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags)
ogg_packet op;
yuv_buffer yuv;
mp_image_t* mpi;
- int i;
memset (&op, 0, sizeof (op));
op.bytes = len;
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index 2eb23da516..860a5d1af8 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -911,10 +911,6 @@ static int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts){
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 int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts){
}
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){
diff --git a/libmpcodecs/vf_detc.c b/libmpcodecs/vf_detc.c
index 40d68f880e..52932d8d6b 100644
--- a/libmpcodecs/vf_detc.c
+++ b/libmpcodecs/vf_detc.c
@@ -177,7 +177,6 @@ static int analyze_fixed_pattern(struct vf_priv_s *p, mp_image_t *new, mp_image_
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;
diff --git a/libmpcodecs/vf_harddup.c b/libmpcodecs/vf_harddup.c
index eb7527a703..65d077b083 100644
--- a/libmpcodecs/vf_harddup.c
+++ b/libmpcodecs/vf_harddup.c
@@ -18,7 +18,6 @@ struct vf_priv_s {
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;
diff --git a/libmpcodecs/vf_kerndeint.c b/libmpcodecs/vf_kerndeint.c
index f687b8942c..4d66a3898d 100644
--- a/libmpcodecs/vf_kerndeint.c
+++ b/libmpcodecs/vf_kerndeint.c
@@ -91,7 +91,6 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
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 query_format(struct vf_instance_s* vf, unsigned int fmt){
}
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;
diff --git a/libmpcodecs/vf_remove_logo.c b/libmpcodecs/vf_remove_logo.c
index a3a5e47eb3..775c81d280 100644
--- a/libmpcodecs/vf_remove_logo.c
+++ b/libmpcodecs/vf_remove_logo.c
@@ -535,8 +535,6 @@ void load_pgm_skip(FILE *f) {
*/
pgm_structure * load_pgm(const char * file_name)
{
- unsigned char flags;
- int x, y;
int maximum_greyscale_value;
FILE * input;
int pnm_number;
diff --git a/libmpcodecs/vf_uspp.c b/libmpcodecs/vf_uspp.c
index 14ae9592a0..24d388dcb2 100644
--- a/libmpcodecs/vf_uspp.c
+++ b/libmpcodecs/vf_uspp.c
@@ -177,7 +177,7 @@ static void filter(struct vf_priv_s *p, uint8_t *dst[3], uint8_t *src[3], int ds
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];
diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c
index 9d0cf467c5..5fcea7b94a 100644
--- a/libvo/vo_dga.c
+++ b/libvo/vo_dga.c
@@ -286,7 +286,6 @@ static void fillblock(char *strt, int yoff, int lines, int val)
static int draw_frame(uint8_t * src[])
{
- int vp_skip = vo_dga_vp_skip;
int numlines = vo_dga_lines;
char *s, *d;
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index bffd7880b4..f2649ccb32 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -383,7 +383,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
if (WinID)
{
int border;
- Window win;
XUnmapWindow(mDisplay, vo_window);
XChangeWindowAttributes(mDisplay, vo_window, xswamask,
&xswa);
diff --git a/vidix/drivers/cyberblade_vid.c b/vidix/drivers/cyberblade_vid.c
index 4dfb59d651..3000bab87d 100644
--- a/vidix/drivers/cyberblade_vid.c
+++ b/vidix/drivers/cyberblade_vid.c
@@ -488,7 +488,6 @@ int vixConfigPlayback(vidix_playback_t *info)
if(CRINB(0xd1)&0x80)
{
- int hcorr,vcorr;
int TVHTotal,TVVTotal,TVHSyncStart,TVVSyncStart,TVOverflow;
LOGWRITE("[cyberblade] Using TV-CRTC\n");