summaryrefslogtreecommitdiffstats
path: root/demux_avi.c
diff options
context:
space:
mode:
authorarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-06 01:18:59 +0000
committerarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-06 01:18:59 +0000
commitd9a5713e26f69230f3dc35a8d9136d2d583f7b7f (patch)
tree0b23fc29e4255baa3aa03b76c63c11caa95d89cc /demux_avi.c
parentd81123c78b8d00d9a9534173ba69dc5c437f80d5 (diff)
downloadmpv-d9a5713e26f69230f3dc35a8d9136d2d583f7b7f.tar.bz2
mpv-d9a5713e26f69230f3dc35a8d9136d2d583f7b7f.tar.xz
sh_audio/sh_video added, general codec cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@292 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'demux_avi.c')
-rw-r--r--demux_avi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/demux_avi.c b/demux_avi.c
index 5396c43041..9a847fec23 100644
--- a/demux_avi.c
+++ b/demux_avi.c
@@ -48,7 +48,9 @@ static int demux_avi_read_packet(demuxer_t *demux,unsigned int id,unsigned int l
}
// ezt a 2 sort lehet hogy fell kell majd cserelni:
//avi_video_pts+=avi_pts_frametime;
- avi_video_pts+=(float)avi_header.video.dwScale/(float)avi_header.video.dwRate;
+ //avi_video_pts+=(float)avi_header.video.dwScale/(float)avi_header.video.dwRate;
+ //avi_video_pts+=((sh_video_t*)ds->sh)->frametime;
+ avi_video_pts+=(float)((sh_video_t*)(demux->video->sh))->video.dwScale/(float)((sh_video_t*)(demux->video->sh))->video.dwRate;
avi_audio_pts=avi_video_pts;
}