summaryrefslogtreecommitdiffstats
path: root/libmpdemux/mpeg_hdr.c
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-25 23:07:28 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-25 23:07:28 +0000
commit0b0fac0e9cea53f143fe759829988f53d0de31d1 (patch)
treed7b4ef99c8d5390adcd84b4936491d22804c573d /libmpdemux/mpeg_hdr.c
parent894097dc5a9d3dce49dbe60439f60f93ec59da15 (diff)
downloadmpv-0b0fac0e9cea53f143fe759829988f53d0de31d1.tar.bz2
mpv-0b0fac0e9cea53f143fe759829988f53d0de31d1.tar.xz
H264: when fixed_fps is set the framerate is expressed in fields per second, so it must be halved
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17953 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/mpeg_hdr.c')
-rw-r--r--libmpdemux/mpeg_hdr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/mpeg_hdr.c b/libmpdemux/mpeg_hdr.c
index d6ecf9cc6d..4ab8fea45d 100644
--- a/libmpdemux/mpeg_hdr.c
+++ b/libmpdemux/mpeg_hdr.c
@@ -287,6 +287,8 @@ static int h264_parse_vui(mp_mpeg_header_t * picture, unsigned char * buf, unsig
if(picture->timeinc_unit > 0 && picture->timeinc_resolution > 0)
picture->fps = (float) picture->timeinc_resolution / (float) picture->timeinc_unit;
+ if(fixed_fps)
+ picture->fps /= 2;
}
//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,