[MPlayer-cvslog] CVS: main/libmpdemux mpeg_hdr.c,1.16,1.17

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

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

Modified Files:
	mpeg_hdr.c 
Log Message:
multiplying fps by 10000 is no more necessary (when determining mp4v and h264 framerate)

Index: mpeg_hdr.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/mpeg_hdr.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mpeg_hdr.c	6 Aug 2005 16:15:07 -0000	1.16
+++ mpeg_hdr.c	30 Aug 2005 22:07:30 -0000	1.17
@@ -191,7 +191,7 @@
       n = read_timeinc(picture, buffer, n);
       
       if(picture->timeinc_unit)
-        picture->fps = (picture->timeinc_resolution * 10000) / picture->timeinc_unit;
+        picture->fps = (float) picture->timeinc_resolution / (float) picture->timeinc_unit;
     }
     
     //fprintf(stderr, "ASPECT: %d, PARW=%d, PARH=%d, TIMEINCRESOLUTION: %d, FIXED_TIMEINC: %d (number of bits: %d), FPS: %u\n", 
@@ -286,7 +286,7 @@
     fixed_fps = getbits(buf, n, 1);
     
     if(picture->timeinc_unit > 0 && picture->timeinc_resolution > 0)
-      picture->fps = ((uint64_t)picture->timeinc_resolution * 10000) / picture->timeinc_unit;
+      picture->fps = (float) picture->timeinc_resolution / (float) picture->timeinc_unit;
   }
   
   //fprintf(stderr, "H264_PARSE_VUI, OVESCAN=%u, VSP_COLOR=%u, CHROMA=%u, TIMING=%u, DISPW=%u, DISPH=%u, TIMERES=%u, TIMEINC=%u, FIXED_FPS=%u\n", overscan, vsp_color, chroma, timing, picture->display_picture_width, picture->display_picture_height,