Author: diego Date: Sat Feb 7 16:29:22 2009 New Revision: 28476 Log: Fix a couple of unused variable warnings through the av_unused attribute. Modified: trunk/libmpdemux/demux_mov.c Modified: trunk/libmpdemux/demux_mov.c ============================================================================== --- trunk/libmpdemux/demux_mov.c Sat Feb 7 16:23:55 2009 (r28475) +++ trunk/libmpdemux/demux_mov.c Sat Feb 7 16:29:22 2009 (r28476) @@ -41,6 +41,7 @@ #include "stheader.h" #include "libmpcodecs/img_format.h" +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libvo/sub.h" @@ -434,8 +435,8 @@ static int mov_check_file(demuxer_t* dem 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); + av_unused int tmp=stream_read_dword(demuxer->stream); + av_unused int type=stream_read_dword_le(demuxer->stream); int slen=stream_read_dword(demuxer->stream); //char* s=malloc(slen+1); //stream_read(demuxer->stream,s,slen); @@ -455,7 +456,7 @@ static int mov_check_file(demuxer_t* dem len-=12+slen;i-=12+slen; break; } case MOV_FOURCC('r','m','d','r'): { - int flags=stream_read_dword(demuxer->stream); + av_unused 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; @@ -1658,12 +1659,12 @@ static int lschunks_intrak(demuxer_t* de break; } case MOV_FOURCC('h','d','l','r'): { - unsigned int tmp = stream_read_dword(demuxer->stream); + av_unused 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); + av_unused unsigned int comp_flags = stream_read_dword(demuxer->stream); + av_unused 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); @@ -1743,7 +1744,7 @@ static int lschunks_intrak(demuxer_t* de break; } case MOV_FOURCC('s','t','t','s'): { - int temp = stream_read_dword(demuxer->stream); + av_unused int temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; unsigned int pts = 0; @@ -1802,7 +1803,7 @@ static int lschunks_intrak(demuxer_t* de break; } case MOV_FOURCC('s','t','c','o'): { - int temp = stream_read_dword(demuxer->stream); + av_unused int temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; mp_msg(MSGT_DEMUX, MSGL_V, @@ -1819,7 +1820,7 @@ static int lschunks_intrak(demuxer_t* de break; } case MOV_FOURCC('c','o','6','4'): { - int temp = stream_read_dword(demuxer->stream); + av_unused int temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; mp_msg(MSGT_DEMUX, MSGL_V, @@ -2191,7 +2192,7 @@ if(trak->pos==0 && trak->stream_header_l if (samplenr < 0) vo_sub = NULL; else if (samplenr != priv->current_sub) { - sh_sub_t *sh = demuxer->sub->sh; + av_unused sh_sub_t *sh = demuxer->sub->sh; off_t pos = trak->samples[samplenr].pos; int len = trak->samples[samplenr].size; double subpts = (double)trak->samples[samplenr].pts / (double)trak->timescale;