# HG changeset patch # User nicodvb # Date 1125439650 0 # Node ID 798d9be2337f9498e4bd6c89ea607f16ea9cc8b9 # Parent e27998eeb54a1f7b306bda9c238e416652b4d01b multiplying fps by 10000 is no more necessary (when determining mp4v and h264 framerate) diff -r e27998eeb54a -r 798d9be2337f libmpdemux/mpeg_hdr.c --- a/libmpdemux/mpeg_hdr.c Tue Aug 30 19:06:55 2005 +0000 +++ b/libmpdemux/mpeg_hdr.c Tue Aug 30 22:07:30 2005 +0000 @@ -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,