summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-02-07 15:29:22 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-02-07 15:29:22 +0000
commit19e71dbc5441e664d66c2d83e44d6a11c0bb5a42 (patch)
tree93198c131dd712edce81218c3008eaf36b15a6ca /libmpdemux
parent2817da6233486d30f15b12cac1423c01ee1b82d4 (diff)
downloadmpv-19e71dbc5441e664d66c2d83e44d6a11c0bb5a42.tar.bz2
mpv-19e71dbc5441e664d66c2d83e44d6a11c0bb5a42.tar.xz
Fix a couple of unused variable warnings through the av_unused attribute.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28476 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mov.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 75bba25b2c..8217c47a95 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -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* 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);
+ 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* demuxer){
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* demuxer, int level, unsigned int id,
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* demuxer, int level, unsigned int id,
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* demuxer, int level, unsigned int id,
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* demuxer, int level, unsigned int id,
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_len>0){
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;