diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-30 22:07:30 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-30 22:07:30 +0000 |
| commit | 24096d2755346b3f085fa8d233537e09d6970d8a (patch) | |
| tree | f369ab6a78ab729d6218fa26e5b253de09783a82 /libmpdemux | |
| parent | b79c4cc29318c4070d49bf348319b5848a0eb4e8 (diff) | |
| download | mpv-24096d2755346b3f085fa8d233537e09d6970d8a.tar.bz2 mpv-24096d2755346b3f085fa8d233537e09d6970d8a.tar.xz | |
multiplying fps by 10000 is no more necessary (when determining mp4v and h264 framerate)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16320 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/mpeg_hdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/mpeg_hdr.c b/libmpdemux/mpeg_hdr.c index a204a2a2e4..d6ecf9cc6d 100644 --- a/libmpdemux/mpeg_hdr.c +++ b/libmpdemux/mpeg_hdr.c @@ -191,7 +191,7 @@ int mp4_header_process_vol(mp_mpeg_header_t * picture, unsigned char * buffer) 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 @@ static int h264_parse_vui(mp_mpeg_header_t * picture, unsigned char * buf, unsig 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, |