Made it work again -- it now detects fish! (This involved clearing out

[libav.git] / vhook / imlib2.c

diff --git a/vhook/imlib2.c b/vhook/imlib2.c
index 576b45d..d569c80 100644 (file)
--- a/vhook/imlib2.c
+++ b/vhook/imlib2.c
@@ -112,10 +112,10 @@ int Configure(void **ctxp, int argc, char *argv[])
                 font = optarg;
                 break;
             case 't':
-                ci->text = strdup(optarg);
+                ci->text = av_strdup(optarg);
                 break;
             case 'f':
-                ci->file = strdup(optarg);
+                ci->file = av_strdup(optarg);
                 break;
             case 'x':
                 ci->x = atoi(optarg);
@@ -193,7 +193,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;
@@ -210,9 +210,9 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width,
     imlib_context_set_image(image);
     data = imlib_image_get_data();
 
-    if (pix_fmt != PIX_FMT_BGRA32) {
-        avpicture_fill(&picture1, (UINT8 *) data, PIX_FMT_BGRA32, width, height);
-        if (img_convert(&picture1, PIX_FMT_BGRA32, 
+    if (pix_fmt != PIX_FMT_RGBA32) {
+        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;
         }
@@ -249,7 +249,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width,
             }
         }
 
-        strftime(buff, sizeof(buff), tbp, localtime(&now));
+        strftime(buff, sizeof(buff), tbp ? tbp : "[No data]", localtime(&now));
 
         x = ci->x;
         y = ci->y;
@@ -264,9 +264,9 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width,
         }
     }
 
-    if (pix_fmt != PIX_FMT_BGRA32) {
+    if (pix_fmt != PIX_FMT_RGBA32) {
         if (img_convert(picture, pix_fmt, 
-                        &picture1, PIX_FMT_BGRA32, width, height) < 0) {
+                        &picture1, PIX_FMT_RGBA32, width, height) < 0) {
         }
     }