diff options
author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-03-14 13:57:15 +0000 |
---|---|---|
committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-03-14 13:57:15 +0000 |
commit | eb0240ff0f72d78e583a40292d3ba0fe7efa22ab (patch) | |
tree | 67a4db2624f10f73d80195bdfd26e77b95c1f3ca /src/xine-engine/video_overlay.c | |
parent | 6e0f8db43be862f7612e6132db0371a875ffd6dc (diff) | |
download | xine-lib-eb0240ff0f72d78e583a40292d3ba0fe7efa22ab.tar.gz xine-lib-eb0240ff0f72d78e583a40292d3ba0fe7efa22ab.tar.bz2 |
- make libsputext work again
- update osd & video_overlay to use 64-bits pts
CVS patchset: 1569
CVS date: 2002/03/14 13:57:15
Diffstat (limited to 'src/xine-engine/video_overlay.c')
-rw-r--r-- | src/xine-engine/video_overlay.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c index da759b717..52b01beb8 100644 --- a/src/xine-engine/video_overlay.c +++ b/src/xine-engine/video_overlay.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_overlay.c,v 1.15 2002/03/14 04:31:49 miguelfreitas Exp $ + * $Id: video_overlay.c,v 1.16 2002/03/14 13:57:15 miguelfreitas Exp $ * */ @@ -329,7 +329,7 @@ static void video_overlay_print_overlay( vo_overlay_t *ovl ) { process overlay events if vpts == 0 will process everything now (used in flush) */ -static void video_overlay_event( video_overlay_t *this, int vpts ) { +static void video_overlay_event( video_overlay_t *this, int64_t vpts ) { int32_t handle; uint32_t this_event; @@ -567,7 +567,7 @@ static void video_overlay_event( video_overlay_t *this, int vpts ) { } if ( (this->video_overlay_events[this_event].event->object.pts != this->video_overlay_objects[handle].pts) ) { - printf ("MENU BUTTON DROPPED menu pts=%u spu pts=%u\n", + printf ("MENU BUTTON DROPPED menu pts=%lld spu pts=%lld\n", this->video_overlay_events[this_event].event->object.pts, this->video_overlay_objects[handle].pts); } @@ -602,7 +602,7 @@ static void video_overlay_event( video_overlay_t *this, int vpts ) { /* This is called from video_out.c * must call output->overlay_blend for each active overlay. */ -static void video_overlay_multiple_overlay_blend(video_overlay_instance_t *this_gen, int vpts, +static void video_overlay_multiple_overlay_blend(video_overlay_instance_t *this_gen, int64_t vpts, vo_driver_t *output, vo_frame_t *vo_img, int enabled) { video_overlay_t *this = (video_overlay_t *) this_gen; int i; |