summaryrefslogtreecommitdiffstats
path: root/libmpdemux/mpeg_hdr.c
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-03-01 23:45:32 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-03-01 23:45:32 +0000
commit8896e5e98f834a684937757e9b2eec58e76a402b (patch)
tree1087d5e6973481468b946c1a500b5cc365d0b25a /libmpdemux/mpeg_hdr.c
parent77fab94da13cc9ca368919d3ae2924cbc9b643ed (diff)
downloadmpv-8896e5e98f834a684937757e9b2eec58e76a402b.tar.bz2
mpv-8896e5e98f834a684937757e9b2eec58e76a402b.tar.xz
Fix:
mpeg_hdr.c:212: warning: no return statement in function returning non-void mpeg_hdr.c:262: warning: suggest parentheses around assignment used as truth value mpeg_hdr.c:264: warning: suggest parentheses around assignment used as truth value mpeg_hdr.c:270: warning: suggest parentheses around assignment used as truth value mpeg_hdr.c:275: warning: suggest parentheses around assignment used as truth value mpeg_hdr.c:212: warning: control reaches end of non-void function mp4_header_process_vop() return value isn't used anywhere anyway. Approved by Nico. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14888 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/mpeg_hdr.c')
-rw-r--r--libmpdemux/mpeg_hdr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpdemux/mpeg_hdr.c b/libmpdemux/mpeg_hdr.c
index 99631718e3..b4bdbd063c 100644
--- a/libmpdemux/mpeg_hdr.c
+++ b/libmpdemux/mpeg_hdr.c
@@ -198,7 +198,7 @@ int mp4_header_process_vol(mp_mpeg_header_t * picture, unsigned char * buffer)
return 0;
}
-int mp4_header_process_vop(mp_mpeg_header_t * picture, unsigned char * buffer)
+void mp4_header_process_vop(mp_mpeg_header_t * picture, unsigned char * buffer)
{
int n;
n = 0;
@@ -260,20 +260,20 @@ static int h264_parse_vui(mp_mpeg_header_t * picture, unsigned char * buf, unsig
}
}
- if(overscan=getbits(buf, n++, 1))
+ if((overscan=getbits(buf, n++, 1)))
n++;
- if(vsp_color=getbits(buf, n++, 1))
+ if((vsp_color=getbits(buf, n++, 1)))
{
n += 4;
if(getbits(buf, n++, 1))
n += 24;
}
- if(chroma=getbits(buf, n++, 1))
+ if((chroma=getbits(buf, n++, 1)))
{
read_golomb(buf, &n);
read_golomb(buf, &n);
}
- if(timing=getbits(buf, n++, 1))
+ if((timing=getbits(buf, n++, 1)))
{
picture->timeinc_unit = (getbits(buf, n, 8) << 24) | (getbits(buf, n+8, 8) << 16) | (getbits(buf, n+16, 8) << 8) | getbits(buf, n+24, 8);
n += 32;