diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-14 14:02:55 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-14 14:02:55 +0000 |
| commit | 45200bc6dfe57f53dce39cc3883a14d6b7a538a3 (patch) | |
| tree | 3e1d1e3c8d943342834672edfa00512f66292d62 /mplayer.c | |
| parent | 50208828f7d8197302cbc93e3162b9e9b8ef7407 (diff) | |
| download | mpv-45200bc6dfe57f53dce39cc3883a14d6b7a538a3.tar.bz2 mpv-45200bc6dfe57f53dce39cc3883a14d6b7a538a3.tar.xz | |
Use vf control for reading pts from vf_vo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20922 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -3084,8 +3084,6 @@ char *tmp; int gui_no_filename=0; -struct {double pts; vo_functions_t *vo;} vf_vo_data; - srand((int) time(NULL)); InitTimer(); @@ -4107,10 +4105,9 @@ sh_video->video_out=video_out; inited_flags|=INITED_VO; } -vf_vo_data.vo = video_out; current_module="init_video_filters"; { - char* vf_arg[] = { "_oldargs_", (char*)&vf_vo_data , NULL }; + char* vf_arg[] = { "_oldargs_", (char*)video_out , NULL }; sh_video->vfilter=(void*)vf_open_filter(NULL,"vo",vf_arg); } #ifdef HAVE_MENU @@ -4385,7 +4382,8 @@ if(!sh_video) { eof = 1; break; } - sh_video->pts = vf_vo_data.pts; + ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, + VFCTRL_GET_PTS, &sh_video->pts); if (sh_video->pts == MP_NOPTS_VALUE) { mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts after filters MISSING\n"); sh_video->pts = last_pts; |