Remove unused variables, patch by Stefan Huehner stefan at huehner org.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18963 b3059339-0415-0410-9bf9-f77b7e298cf2

17 files changed, 4 insertions, 25 deletions

diff --git a/libmpcodecs/ad_hwmpa.c b/libmpcodecs/ad_hwmpa.c
index a3fcb0277b..c553230a84 100644
--- a/libmpcodecs/ad_hwmpa.c
+++ b/libmpcodecs/ad_hwmpa.c
@@ -109,7 +109,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
 
 static int control(sh_audio_t *sh,int cmd,void* arg, ...)
 {
-	int start, len, n;
+	int start, len;
 
 	switch(cmd)
 	{
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c
index 9bf1c8f7a6..2055ff6ef4 100644
--- a/libmpdemux/aviheader.c
+++ b/libmpdemux/aviheader.c
@@ -358,8 +358,6 @@ while(1){
 	demuxer->movi_end=stream_tell(demuxer->stream); // fixup movi-end
     if(index_mode && !priv->isodml){
       int i;
-      off_t base = 0;
-      uint32_t last_off = 0;
       priv->idx_size=size2>>4;
       mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_ReadingIndexBlockChunksForFrames,
         priv->idx_size,avih.dwTotalFrames, (int64_t)stream_tell(demuxer->stream));
@@ -443,7 +441,6 @@ if (priv->suidx_size > 0 && priv->idx_size == 0) {
 
 if (priv->isodml && (index_mode==-1 || index_mode==0 || index_mode==1)) {
     int i, j, k;
-    int safety=1000;
 
     avisuperindex_chunk *cx;
     AVIINDEXENTRY *idx;
diff --git a/libmpdemux/demux_demuxers.c b/libmpdemux/demux_demuxers.c
index 71440f8ed4..d676e82ab2 100644
--- a/libmpdemux/demux_demuxers.c
+++ b/libmpdemux/demux_demuxers.c
@@ -86,7 +86,6 @@ static void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,float aud
 }
 
 static void demux_close_demuxers(demuxer_t* demuxer) {
-  int i;
   dd_priv_t* priv = demuxer->priv;
   stream_t *s;
 
diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c
index 0f390b074d..ddd11f757b 100644
--- a/libmpdemux/demux_gif.c
+++ b/libmpdemux/demux_gif.c
@@ -39,7 +39,6 @@ static int gif_check_file(demuxer_t *demuxer)
 static int demux_gif_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds)
 {
   GifFileType *gif = (GifFileType *)demuxer->priv;
-  sh_video_t *sh_video = (sh_video_t *)demuxer->video->sh;
   GifRecordType type = UNDEFINED_RECORD_TYPE;
   int len = 0;
   demux_packet_t *dp = NULL;
diff --git a/libmpdemux/demux_lmlm4.c b/libmpdemux/demux_lmlm4.c
index b6456d7c7e..a7c31ec67b 100644
--- a/libmpdemux/demux_lmlm4.c
+++ b/libmpdemux/demux_lmlm4.c
@@ -127,7 +127,6 @@ int searchMPEG4Stream(demuxer_t* demuxer, IME6400Header *imeHeader)
 
 static int getFrame(demuxer_t *demuxer, FrameInfo *frameInfo)
 {
-    int retCode;
     unsigned int packetSize;
 
     frameInfo->channelNo = stream_read_word(demuxer->stream);
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index e80ce03090..a71491d367 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -412,7 +412,6 @@ static int mov_check_file(demuxer_t* demuxer){
 	  skipped+=8;
 	  i = stream_read_dword(demuxer->stream)-8;
 	  if(stream_read_dword(demuxer->stream)==MOV_FOURCC('r','m','r','a')){
-	      int ref=0;
 	      skipped+=i;
 	      mp_msg(MSGT_DEMUX,MSGL_INFO,"MOV: Reference Media file!!!\n");
 	      //set demuxer type to playlist ...
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c
index bf6b88f4b5..680ce1d7c3 100644
--- a/libmpdemux/demux_mpg.c
+++ b/libmpdemux/demux_mpg.c
@@ -798,8 +798,6 @@ void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_delay, in
 }
 
 int demux_mpg_control(demuxer_t *demuxer,int cmd, void *arg){
-    demux_stream_t *d_video=demuxer->video;
-    sh_video_t *sh_video=d_video->sh;
     mpg_demuxer_t *mpg_d=(mpg_demuxer_t*)demuxer->priv;
     int msec = 0;
 
diff --git a/libmpdemux/demux_nuv.c b/libmpdemux/demux_nuv.c
index 05ae937a5a..fdce7f4acd 100644
--- a/libmpdemux/demux_nuv.c
+++ b/libmpdemux/demux_nuv.c
@@ -226,7 +226,6 @@ static int demux_nuv_fill_buffer ( demuxer_t *demuxer, demux_stream_t *ds )
 /* Scan for the extended data in MythTV nuv streams */
 static int demux_xscan_nuv(demuxer_t* demuxer, int width, int height) {
   int i;
-  int res = 0;
   off_t orig_pos = stream_tell(demuxer->stream);
   struct rtframeheader rtjpeg_frameheader;
   struct extendeddata ext;
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index ed8086f362..c180b2ca1b 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -1436,7 +1436,6 @@ static void demux_ogg_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_de
   ogg_stream_state* oss;
   ogg_stream_t* os;
   demux_stream_t* ds;
-  sh_audio_t* sh_audio = demuxer->audio->sh;
   ogg_packet op;
   float rate;
   int i,sp,first,precision=1,do_seek=1;
diff --git a/libmpdemux/demux_realaud.c b/libmpdemux/demux_realaud.c
index 7608251387..3f347d6262 100644
--- a/libmpdemux/demux_realaud.c
+++ b/libmpdemux/demux_realaud.c
@@ -73,8 +73,6 @@ static int demux_ra_fill_buffer(demuxer_t *demuxer, demux_stream_t *dsds)
 {
 	ra_priv_t *ra_priv = demuxer->priv;
 	int len;
-	int timestamp;
-	int flags;
 	demux_stream_t *ds = demuxer->audio;
 	sh_audio_t *sh = ds->sh;
 	WAVEFORMATEX *wf = sh->wf;
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c
index 144c280b74..afa5b10038 100644
--- a/libmpdemux/demux_ty.c
+++ b/libmpdemux/demux_ty.c
@@ -1112,7 +1112,6 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
 		{
 			unsigned char b1;
 			unsigned char b2;
-			unsigned char buffer[ 16 ];
 
 			b1 = ( ( ( recPtr[ 0 ] & 0x0f ) << 4 ) | 
 				( ( recPtr[ 1 ] & 0xf0 ) >> 4 ) );
@@ -1145,7 +1144,6 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
 		{
 			unsigned char b1;
 			unsigned char b2;
-			unsigned char buffer[ 16 ];
 
 			b1 = ( ( ( recPtr[ 0 ] & 0x0f ) << 4 ) | 
 				( ( recPtr[ 1 ] & 0xf0 ) >> 4 ) );
diff --git a/libmpdemux/demux_ty_osd.c b/libmpdemux/demux_ty_osd.c
index d68c7a5ff7..92b2f107f0 100644
--- a/libmpdemux/demux_ty_osd.c
+++ b/libmpdemux/demux_ty_osd.c
@@ -84,7 +84,6 @@ void ty_ClearOSD( int start )
 
 static void ty_DrawChar( int *x, int *y, char disChar, int fgColor, int bgColor )
 {
-	int index;
    int cx;
    int cy;
 
diff --git a/libmpdemux/http.c b/libmpdemux/http.c
index 6b122eda55..ce7738427a 100644
--- a/libmpdemux/http.c
+++ b/libmpdemux/http.c
@@ -166,7 +166,6 @@ static int scast_streaming_read(int fd, char *buffer, int size,
 
 static int scast_streaming_start(stream_t *stream) {
   int metaint;
-  int fromhdr;
   scast_data_t *scast_data;
   HTTP_header_t *http_hdr = stream->streaming_ctrl->data;
   int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0;
@@ -856,7 +855,6 @@ static int http_streaming_start(stream_t *stream, int* file_format) {
 static int fixup_open(stream_t *stream,int seekable) {
 	HTTP_header_t *http_hdr = stream->streaming_ctrl->data;
 	int is_icy = http_hdr && http_get_field(http_hdr, "Icy-MetaInt");
-	char *content_type = http_get_field( http_hdr, "Content-Type" );
 	int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0;
 
 	stream->type = STREAMTYPE_STREAM;
diff --git a/libmpdemux/muxer_avi.c b/libmpdemux/muxer_avi.c
index 3a127555ee..07a6a07133 100644
--- a/libmpdemux/muxer_avi.c
+++ b/libmpdemux/muxer_avi.c
@@ -274,7 +274,6 @@ static void avifile_write_header(muxer_t *muxer){
   FILE *f = muxer->file;
   VideoPropHeader vprp;
   uint32_t aspect = avi_aspect(muxer->def_v);
-  off_t pos;
   struct avi_stream_info *vsi = muxer->def_v->priv;
   int isodml = vsi->riffofspos > 0;
 
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index a011b985ce..38299d98de 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -1101,8 +1101,7 @@ static int fill_packet(muxer_t *muxer, muxer_stream_t *s, int finalize)
 	//if audio and a52 insert the headers
 	muxer_priv_t *priv = (muxer_priv_t *) muxer->priv;
 	muxer_headers_t *spriv = (muxer_headers_t *) s->priv;
-	int pes_hlen = 0, len, stflen, stuffing_len, m, n, dvd_pack = 0, len2, target, hlen;
-	uint64_t pts=0, dts=0;
+	int len, m, n, dvd_pack = 0;
 	mpeg_frame_t *frm;
 	pack_stats_t p;
 
diff --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c
index c6e5f8041f..928610eab0 100644
--- a/libmpdemux/tvi_v4l2.c
+++ b/libmpdemux/tvi_v4l2.c
@@ -1336,7 +1336,6 @@ static void *video_grabber(void *data)
     priv_t *priv = (priv_t*)data;
     long long skew, prev_skew, xskew, interval, prev_interval, delta;
     int i;
-    int err_count = 0;
     int framesize = priv->format.fmt.pix.height*priv->format.fmt.pix.width*
 	pixfmt2depth(priv->format.fmt.pix.pixelformat)/8;
     fd_set rdset;
diff --git a/m_option.c b/m_option.c
index 893f8e8fe1..4a5b2e0de7 100644
--- a/m_option.c
+++ b/m_option.c
@@ -1198,7 +1198,7 @@ static int find_obj_desc(char* name,m_obj_list_t* l,m_struct_t** ret) {
 
 static int get_obj_param(char* opt_name,char* obj_name, m_struct_t* desc,
 			 char* str,int* nold,int oldmax,char** dst) {
-  char* eq,param;
+  char* eq;
   m_option_t* opt;
   int r;
 
@@ -1252,7 +1252,7 @@ static int get_obj_param(char* opt_name,char* obj_name, m_struct_t* desc,
 static int get_obj_params(char* opt_name, char* name,char* params,
 			  m_struct_t* desc,char separator, char*** _ret) {
   int n = 0,nold = 0, nopts,r;
-  char* ptr,*last_ptr = params,*eq;
+  char* ptr,*last_ptr = params;
   char** ret;
 
   if(!strcmp(params,"help")) { // Help