# HG changeset patch # User rathann # Date 1109720732 0 # Node ID e9c9fbc780922741e1c0871e691dbaa863dc82fb # Parent a109ae86ba63925e5401e62d262a5012d0905a5d 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. diff -r a109ae86ba63 -r e9c9fbc78092 libmpdemux/mpeg_hdr.c --- a/libmpdemux/mpeg_hdr.c Tue Mar 01 22:57:57 2005 +0000 +++ b/libmpdemux/mpeg_hdr.c Tue Mar 01 23:45:32 2005 +0000 @@ -198,7 +198,7 @@ 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 @@ } } - 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; diff -r a109ae86ba63 -r e9c9fbc78092 libmpdemux/mpeg_hdr.h --- a/libmpdemux/mpeg_hdr.h Tue Mar 01 22:57:57 2005 +0000 +++ b/libmpdemux/mpeg_hdr.h Tue Mar 01 23:45:32 2005 +0000 @@ -23,5 +23,5 @@ int mp_header_process_sequence_header (mp_mpeg_header_t * picture, unsigned char * buffer); int mp_header_process_extension (mp_mpeg_header_t * picture, unsigned char * buffer); int mp4_header_process_vol(mp_mpeg_header_t * picture, unsigned char * buffer); -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 h264_parse_sps(mp_mpeg_header_t * picture, unsigned char * buf, int len);