1000l

[ffmpeg] / vhook / imlib2.c

diff --git a/vhook/imlib2.c b/vhook/imlib2.c
index 6c6707b78b728aaa779de6604f770c429e649e80..4e890e14e752041c9c661de8bbe4be14bfc312ca 100644 (file)
--- a/vhook/imlib2.c
+++ b/vhook/imlib2.c
@@ -42,18 +42,21 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#include "framehook.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
+#undef time
 #include <sys/time.h>
+#include <time.h>
 #include <X11/Xlib.h>
 #include <Imlib2.h>                                                             
 
-#include "framehook.h"
-
 typedef struct {
     int dummy;
     Imlib_Font fn;
@@ -193,7 +196,7 @@ static void put_cached_image(ContextInfo *ci, Imlib_Image image, int width, int
     ci->cache = cache;
 }
 
-void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, int height, INT64 pts)
+void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, int height, int64_t pts)
 {
     ContextInfo *ci = (ContextInfo *) ctx;
     AVPicture picture1;
@@ -211,7 +214,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width,
     data = imlib_image_get_data();
 
     if (pix_fmt != PIX_FMT_RGBA32) {
-        avpicture_fill(&picture1, (UINT8 *) data, PIX_FMT_RGBA32, width, height);
+        avpicture_fill(&picture1, (uint8_t *) data, PIX_FMT_RGBA32, width, height);
         if (img_convert(&picture1, PIX_FMT_RGBA32, 
                         picture, pix_fmt, width, height) < 0) {
             goto done;