summaryrefslogtreecommitdiffstats
path: root/demux_avi.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-07-29 01:28:07 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-07-29 01:28:07 +0000
commit69c2e0aaa588d2ca82f63493f6e370c9f2bf0bc3 (patch)
treec17b4b0f5a42de2db03ef602701695798d5964f1 /demux_avi.c
parent67df6a8622697ab8f90e8b644bb15663fe8a8fd8 (diff)
downloadmpv-69c2e0aaa588d2ca82f63493f6e370c9f2bf0bc3.tar.bz2
mpv-69c2e0aaa588d2ca82f63493f6e370c9f2bf0bc3.tar.xz
video pts calculation fixed (Desperado-trailer.avi)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1410 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'demux_avi.c')
-rw-r--r--demux_avi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/demux_avi.c b/demux_avi.c
index abf4cbfa2f..8e678bb751 100644
--- a/demux_avi.c
+++ b/demux_avi.c
@@ -68,7 +68,7 @@ static int demux_avi_read_packet(demuxer_t *demux,unsigned int id,unsigned int l
pts=avi_audio_pts;
avi_audio_pts=0;
} else
- if(ds && ds==demux->video){
+ if(ds==demux->video){
// video
if(skip_video_frames>0){
// drop frame (seeking)
@@ -85,7 +85,8 @@ static int demux_avi_read_packet(demuxer_t *demux,unsigned int id,unsigned int l
#if 1
// printf("ds=0x%X\n",ds);
// printf("packno=%d\n",ds->pack_no);
- avi_video_pts = demux->video->pack_no *
+// printf("### pack_no=%d\n",demux->video->pack_no+demux->video->packs);
+ avi_video_pts = (demux->video->pack_no+demux->video->packs) *
(float)((sh_video_t*)demux->video->sh)->video.dwScale /
(float)((sh_video_t*)demux->video->sh)->video.dwRate;
#else