summaryrefslogtreecommitdiffstats
path: root/libmpdemux/video.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-16 14:51:04 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-16 14:51:04 +0000
commitf0a8c2a8a33d5c3b6a5913e32163312099974dea (patch)
treeba40f89311d43a39d418d640d22c18105f28b9b4 /libmpdemux/video.c
parentf216d87ac8f2486afe245d4637d4260546edfb5b (diff)
downloadmpv-f0a8c2a8a33d5c3b6a5913e32163312099974dea.tar.bz2
mpv-f0a8c2a8a33d5c3b6a5913e32163312099974dea.tar.xz
vivo A-V sync fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3527 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/video.c')
-rw-r--r--libmpdemux/video.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index bd6f0e6221..d76288dac5 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -237,6 +237,12 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
if(demuxer->file_format==DEMUXER_TYPE_MOV && !force_fps){
// .MOV files has no fixed FPS - just frame durations!
frame_time=d_video->pts-pts1;
+ } else
+ if(demuxer->file_format==DEMUXER_TYPE_VIVO && !force_fps){
+ // .VIVO files has no fixed FPS - just frame durations!
+ if(d_video->pts-pts1>0)
+ frame_time=d_video->pts-pts1;
+ mp_msg(MSGT_CPLAYER,MSGL_V,"vivo frame_time=%5.3f \n",frame_time);
}
if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS) d_video->pts+=frame_time;