Mandrake patches from

  http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/SPECS/xine-lib/
via Goetz Waschk who reports:
  The amd64 patch (xine-lib-1-rc0a-amd64.patch) sets some conservative
  CFLAGS for amd64,
  the lib64 patch (xine-lib-1-rc0a-lib64.patch) replaces hardcoded
  /lib to support the lib64 library dir on amd64,
  the directfb patch (xine-lib-1-rc2-no-directfb.patch) adds a
  configure option to disable directfb,
  the linuxfb patch (xine-lib-1-rc3a-no-linuxfb.patch) does the same
  for linux framebuffer and
  the 64bit fixes patch (xine-lib-1-rc3-64bit-fixes.patch) doesn't
  apply at the moment against the CVS -- demux_ogg.c was not applied.
  it includes some 64 bit pointer and other fixes for 64bit architectures.
  from Gwenole Beauchesne
I haven't tested other than apply and compile.

CVS patchset: 6174
CVS date: 2004/02/19 02:50:24

1 files changed, 12 insertions, 11 deletions

diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index c23ceb651..706dfeb80 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.185 2004/01/07 22:22:54 jstembridge Exp $
+ * $Id: video_out.c,v 1.186 2004/02/19 02:50:26 rockyb Exp $
  *
  * frame allocation / queuing / scheduling / output functions
  */
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <zlib.h>
 #include <pthread.h>
+#include <inttypes.h>
 #include <assert.h>
 
 #define XINE_ENABLE_EXPERIMENTAL_FEATURES
@@ -344,7 +345,7 @@ static int vo_frame_draw (vo_frame_t *img, xine_stream_t *stream) {
     cur_vpts = this->clock->get_current_time(this->clock);
     this->last_delivery_pts = cur_vpts;
 
-    lprintf ("got image at master vpts %lld. vpts for picture is %lld (pts was %lld)\n",
+    lprintf ("got image oat master vpts %" PRId64 ". vpts for picture is %" PRId64 " (pts was %" PRId64 ")\n",
 	     cur_vpts, pic_vpts, img->pts);
 
     this->num_frames_delivered++;
@@ -385,7 +386,7 @@ static int vo_frame_draw (vo_frame_t *img, xine_stream_t *stream) {
   }
 
 
-  lprintf ("delivery diff : %lld, current vpts is %lld, %d frames to skip\n",
+  lprintf ("delivery diff : %" PRId64 ", current vpts is %" PRId64 ", %d frames to skip\n",
 	   diff, cur_vpts, frames_to_skip);
 
   if (!img->bad_frame) {
@@ -629,7 +630,7 @@ static void expire_frames (vos_t *this, int64_t cur_vpts) {
   
       if( !this->discard_frames ) {
         xine_log(this->xine, XINE_LOG_MSG,
-	         _("video_out: throwing away image with pts %lld because it's too old (diff : %lld).\n"), pts, diff);
+	         _("video_out: throwing away image with pts %" PRId64 " because it's too old (diff : %" PRId64 ").\n"), pts, diff);
 
         this->num_frames_discarded++;
       }
@@ -705,7 +706,7 @@ static vo_frame_t *get_next_frame (vos_t *this, int64_t cur_vpts) {
 
     if (this->img_backup && (this->redraw_needed==1)) {
 
-      lprintf("generating still frame (cur_vpts = %lld) \n", cur_vpts);
+      lprintf("generating still frame (cur_vpts = %" PRId64 ") \n", cur_vpts);
 
       /* keep playing still frames */
       pthread_mutex_lock( &this->free_img_buf_queue->mutex );
@@ -738,7 +739,7 @@ static vo_frame_t *get_next_frame (vos_t *this, int64_t cur_vpts) {
      * time to display frame "img" ?
      */
 
-    lprintf ("diff %lld\n", diff);
+    lprintf ("diff %" PRId64 "\n", diff);
 
     if (diff < 0) {
       pthread_mutex_unlock(&this->display_img_buf_queue->mutex);
@@ -784,7 +785,7 @@ static void overlay_and_display_frame (vos_t *this,
 				       vo_frame_t *img, int64_t vpts) {
   xine_stream_t *stream;
 
-  lprintf ("displaying image with vpts = %lld\n", img->vpts);
+  lprintf ("displaying image with vpts = %" PRId64 "\n", img->vpts);
 
   /* no, this is not were proc_*() is usually called.
    * it's just to catch special cases like late or duplicated frames.
@@ -939,7 +940,7 @@ static void *video_out_loop (void *this_gen) {
 
     vpts = this->clock->get_current_time (this->clock);
 
-    lprintf ("loop iteration at %lld\n", vpts);
+    lprintf ("loop iteration at %" PRId64 "\n", vpts);
 
     expire_frames (this, vpts);
     img = get_next_frame (this, vpts);
@@ -1000,7 +1001,7 @@ static void *video_out_loop (void *this_gen) {
       next_frame_vpts += 1000;
     }
     
-    lprintf ("next_frame_vpts is %lld\n", next_frame_vpts);
+    lprintf ("next_frame_vpts is %" PRId64 "\n", next_frame_vpts);
  
     do {
       vpts = this->clock->get_current_time (this->clock);
@@ -1010,11 +1011,11 @@ static void *video_out_loop (void *this_gen) {
 
       usec_to_sleep = (next_frame_vpts - vpts) * 100 / 9;
 
-      lprintf ("%lld usec to sleep at master vpts %lld\n", usec_to_sleep, vpts);
+      lprintf ("%" PRId64 " usec to sleep at master vpts %" PRId64 "\n", usec_to_sleep, vpts);
       
       if ( (next_frame_vpts - vpts) > 2*90000 )
         xprintf(this->xine, XINE_VERBOSITY_DEBUG,
-		"video_out: vpts/clock error, next_vpts=%lld cur_vpts=%lld\n", next_frame_vpts,vpts);
+		"video_out: vpts/clock error, next_vpts=%" PRId64 " cur_vpts=%" PRId64 "\n", next_frame_vpts,vpts);
                
       if (usec_to_sleep>0) 
 	xine_usec_sleep (usec_to_sleep);