[MPlayer-cvslog] CVS: main/libmpdemux mpeg_hdr.c, 1.8, 1.9 mpeg_hdr.h, 1.3, 1.4

[Dominik Mierzejewski CVS]

CVS change done by Dominik Mierzejewski CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv12407

Modified Files:
	mpeg_hdr.c mpeg_hdr.h 
Log Message:
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.


Index: mpeg_hdr.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/mpeg_hdr.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mpeg_hdr.c	1 Mar 2005 22:57:57 -0000	1.8
+++ mpeg_hdr.c	1 Mar 2005 23:45:32 -0000	1.9
@@ -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;

Index: mpeg_hdr.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/mpeg_hdr.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mpeg_hdr.h	24 Feb 2005 20:02:41 -0000	1.3
+++ mpeg_hdr.h	1 Mar 2005 23:45:32 -0000	1.4
@@ -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);