From 9d4ebc4801effe30c2af538d00864993299e06fe Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Sat, 11 Jan 2003 03:47:01 +0000 Subject: brand-new external subtitles support. (yes, it works!) tested with asf, avi and mpeg but any media should work. todo: - clean up the master/slave stuff and public api. - implement seeking on demux_sputext.c (it must seek to closest subtitle) - general cleaning up and bugfixing CVS patchset: 3860 CVS date: 2003/01/11 03:47:01 --- src/xine-engine/video_out.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/xine-engine/video_out.c') diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index 7610a5a07..336242c3d 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out.c,v 1.132 2003/01/10 19:15:16 miguelfreitas Exp $ + * $Id: video_out.c,v 1.133 2003/01/11 03:47:01 miguelfreitas Exp $ * * frame allocation / queuing / scheduling / output functions */ @@ -306,7 +306,8 @@ static int vo_frame_draw (vo_frame_t *img, xine_stream_t *stream) { stream->metronom->got_video_frame (stream->metronom, img); pic_vpts = img->vpts; - + img->extra_info->vpts = img->vpts; + cur_vpts = this->clock->get_current_time(this->clock); this->last_delivery_pts = cur_vpts; @@ -963,7 +964,7 @@ static int vo_status (xine_video_port_t *this_gen, xine_stream_t *stream, pthread_mutex_lock(&this->streams_lock); for (cur = xine_list_first_content(this->streams); cur; cur = xine_list_next_content(this->streams)) - if (cur == stream) { + if (cur == stream || !stream) { *width = this->current_width; *height = this->current_height; ret = 1; -- cgit v1.2.3