get fish to compile (time() forbidden), pstrcat not declared from ppm.c

Originally committed as revision 3978 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/vhook/fish.c b/vhook/fish.c
index c710526b154828899419cf8a4f9080f7ae0fd3a2..5a274a848eb22b0b3b0dde363220465355ce57f8 100644 (file)
--- a/vhook/fish.c
+++ b/vhook/fish.c
@@ -44,6 +44,7 @@
 
 #include "framehook.h"
 #include "dsputil.h"
+#include "avformat.h"
 
 #define SCALEBITS 10
 #define ONE_HALF  (1 << (SCALEBITS - 1))
@@ -337,7 +338,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width,
                     FILE *f;
                     char fname[256];
 
-                    snprintf(fname, sizeof(fname), "%s/fishimg%ld_%lld.ppm", ci->dir, time(0), pts);
+                    snprintf(fname, sizeof(fname), "%s/fishimg%ld_%lld.ppm", ci->dir, (long)(av_gettime() / 1000000), pts);
                     f = fopen(fname, "w");
                     if (f) {
                         fprintf(f, "P6 %d %d 255\n", width, height);

diff --git a/vhook/ppm.c b/vhook/ppm.c
index 8e48dd9574edd846d1202a40d6fc26e9dbf40504..45e7208788a780ee8637b54e6217133c488d1b97 100644 (file)
--- a/vhook/ppm.c
+++ b/vhook/ppm.c
@@ -24,6 +24,7 @@
 #include <sys/wait.h>
 #include <ctype.h>
 #include "framehook.h"
+#include "avformat.h"
 
 /** Bi-directional pipe structure.
 */