From 5edd9af248f1a917d7daf7e106ac0a18660ef60d Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 May 2007 08:42:35 +0000 Subject: Remove some unused variables, patch by timwoj ieee org. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_macosx.c | 6 ++---- libmpcodecs/vd_ffmpeg.c | 1 - libmpcodecs/vf_yadif.c | 2 +- libmpdemux/asfheader.c | 2 +- libmpdemux/demux_mov.c | 8 -------- libmpdemux/demux_ogg.c | 3 --- libmpdemux/demux_ty.c | 1 - libvo/vo_gl.c | 1 - libvo/vo_macosx.m | 1 - libvo/vo_quartz.c | 1 - libvo/vo_x11.c | 2 +- stream/stream_dvd.c | 2 +- stream/vcd_read_darwin.h | 2 -- 13 files changed, 6 insertions(+), 26 deletions(-) diff --git a/libao2/ao_macosx.c b/libao2/ao_macosx.c index 591fee18fb..6e111519f2 100644 --- a/libao2/ao_macosx.c +++ b/libao2/ao_macosx.c @@ -173,7 +173,7 @@ int req=(inNumFrames)*ao->packetSize; static int control(int cmd,void *arg){ ao_control_vol_t *control_vol; OSStatus err; -Float32 pan, vol; +Float32 vol; switch (cmd) { case AOCONTROL_GET_VOLUME: control_vol = (ao_control_vol_t*)arg; @@ -237,7 +237,7 @@ static void print_format(const char* str,AudioStreamBasicDescription *f){ static int init(int rate,int channels,int format,int flags) { -AudioStreamBasicDescription inDesc, outDesc; +AudioStreamBasicDescription inDesc; ComponentDescription desc; Component comp; AURenderCallbackStruct renderCallback; @@ -402,8 +402,6 @@ static float get_delay(void) /* unload plugin and deregister from coreaudio */ static void uninit(int immed) { - int i; - OSErr status; if (!immed) { long long timeleft=(1000000LL*buf_used())/ao_data.bps; diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 047463fee4..06e8875af2 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -735,7 +735,6 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ AVCodecContext *avctx = ctx->avctx; mp_image_t* mpi=NULL; int dr1= ctx->do_dr1; - unsigned char *buf = NULL; if(len<=0) return NULL; // skipped frame diff --git a/libmpcodecs/vf_yadif.c b/libmpcodecs/vf_yadif.c index abb815ac06..0b37731464 100644 --- a/libmpcodecs/vf_yadif.c +++ b/libmpcodecs/vf_yadif.c @@ -347,7 +347,7 @@ static void filter_line_c(struct vf_priv_s *p, uint8_t *dst, uint8_t *prev, uint } static void filter(struct vf_priv_s *p, uint8_t *dst[3], int dst_stride[3], int width, int height, int parity, int tff){ - int x, y, i; + int y, i; for(i=0; i<3; i++){ int is_chroma= !!i; diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index c8346cf1c2..4f9b8b8342 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -201,7 +201,7 @@ static int get_ext_stream_properties(char *buf, int buf_len, int stream_num, str unsigned bitrate; while ((pos = find_asf_guid(buf, asf_ext_stream_header, pos, buf_len)) >= 0) { - int this_stream_num, stnamect, payct, i, objlen; + int this_stream_num, stnamect, payct, i; int buf_max_index=pos+50; if (buf_max_index > buf_len) return 0; buffer = &buf[pos]; diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index f342752597..e76fb48935 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -434,7 +434,6 @@ static int mov_check_file(demuxer_t* demuxer){ case MOV_FOURCC('r','m','d','a'): continue; case MOV_FOURCC('r','d','r','f'): { - int tmp=stream_read_dword(demuxer->stream); int type=stream_read_dword_le(demuxer->stream); int slen=stream_read_dword(demuxer->stream); //char* s=malloc(slen+1); @@ -455,7 +454,6 @@ static int mov_check_file(demuxer_t* demuxer){ len-=12+slen;i-=12+slen; break; } case MOV_FOURCC('r','m','d','r'): { - int flags=stream_read_dword(demuxer->stream); int rate=stream_read_dword(demuxer->stream); mp_msg(MSGT_DEMUX,MSGL_V," min. data rate: %d bits/sec\n",rate); len-=8; i-=8; break; @@ -1638,12 +1636,9 @@ static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id, break; } case MOV_FOURCC('h','d','l','r'): { - unsigned int tmp = stream_read_dword(demuxer->stream); unsigned int type = stream_read_dword_le(demuxer->stream); unsigned int subtype = stream_read_dword_le(demuxer->stream); unsigned int manufact = stream_read_dword_le(demuxer->stream); - unsigned int comp_flags = stream_read_dword(demuxer->stream); - unsigned int comp_mask = stream_read_dword(demuxer->stream); int len = stream_read_char(demuxer->stream); char* str = malloc(len + 1); stream_read(demuxer->stream, str, len); @@ -1723,7 +1718,6 @@ static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id, break; } case MOV_FOURCC('s','t','t','s'): { - int temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; unsigned int pts = 0; @@ -1782,7 +1776,6 @@ static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id, break; } case MOV_FOURCC('s','t','c','o'): { - int temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; mp_msg(MSGT_DEMUX, MSGL_V, @@ -1799,7 +1792,6 @@ static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id, break; } case MOV_FOURCC('c','o','6','4'): { - int temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; mp_msg(MSGT_DEMUX, MSGL_V, diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 5f6971407e..13205bacf5 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -166,8 +166,6 @@ extern subtitle* vo_sub; void demux_ogg_add_sub (ogg_stream_t* os,ogg_packet* pack) { int lcv; - int line_pos = 0; - int ignoring = 0; char *packet = pack->packet; if (pack->bytes < 4) @@ -247,7 +245,6 @@ static int demux_ogg_get_page_stream(ogg_demuxer_t* ogg_d,ogg_stream_state** os static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,void *context,float* pts,int* flags, int samplesize) { unsigned char* data = pack->packet; - ogg_demuxer_t *ogg_d = os->ogg_d; *pts = 0; *flags = 0; diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index 799d2a77c6..9f2a6e4c05 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -691,7 +691,6 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds ) if ( tivo->tmf != 1 ) { - off_t size; off_t offset; numberParts = demux->stream->end_pos / TIVO_PART_LENGTH; diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index b4c2edd76e..d56eef6513 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -261,7 +261,6 @@ static void genEOSD(mp_eosd_images_t *imgs) { GLint scale_type = (scaled_osd) ? GL_LINEAR : GL_NEAREST; ass_image_t *img = imgs->imgs; ass_image_t *i; - int cnt; if (imgs->changed == 0) // there are elements, but they are unchanged return; diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m index dd1520c43f..fdbff85a14 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_macosx.m @@ -95,7 +95,6 @@ static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigne static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) { - int i; //init screen screen_array = [NSScreen screens]; diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c index b9546dc80d..a47f58c942 100644 --- a/libvo/vo_quartz.c +++ b/libvo/vo_quartz.c @@ -99,7 +99,6 @@ static CGRect bounds; static GDHandle deviceHdl; static CGDataProviderRef dataProviderRef; -static CGImageAlphaInfo alphaInfo; static CGImageRef image; static Rect imgRect; // size of the original image (unscaled) diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 888ef4e49f..d9f04bee0b 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -71,7 +71,7 @@ static unsigned char *ImageDataOrig; /* X11 related variables */ static XImage *myximage = NULL; -static int depth, bpp, mode; +static int depth, bpp; static XWindowAttributes attribs; static int int_pause; diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index 16b66097fa..a07f6b82dd 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -652,7 +652,7 @@ static double dvd_get_current_time(stream_t *stream, int cell) static int dvd_seek_to_time(stream_t *stream, ifo_handle_t *vts_file, double sec) { unsigned int i, j, k, timeunit, ac_time, tmap_sector=0, cell_sector=0, vobu_sector=0; - int t=0, t2=0; + int t=0; double tm, duration; off_t pos = -1; dvd_priv_t *d = stream->priv; diff --git a/stream/vcd_read_darwin.h b/stream/vcd_read_darwin.h index 95b540bf48..81853d08c2 100644 --- a/stream/vcd_read_darwin.h +++ b/stream/vcd_read_darwin.h @@ -45,7 +45,6 @@ return 0; int vcd_seek_to_track(mp_vcd_priv_t* vcd, int track) { - dk_cd_read_track_info_t tocentry; struct CDTrackInfo entry; memset( &vcd->entry, 0, sizeof(vcd->entry)); @@ -69,7 +68,6 @@ int vcd_get_track_end(mp_vcd_priv_t* vcd, int track) dk_cd_read_disc_info_t tochdr; struct CDDiscInfo hdr; - dk_cd_read_track_info_t tocentry; struct CDTrackInfo entry; //read toc header -- cgit v1.2.3