new parameter addspacechars

[swftools.git] / avi2swf / v2swf.c

diff --git a/avi2swf/v2swf.c b/avi2swf/v2swf.c
index 0eb78f6..c974bfb 100644 (file)
--- a/avi2swf/v2swf.c
+++ b/avi2swf/v2swf.c
@@ -34,8 +34,8 @@ typedef struct _v2swf_internal_t
     
     int myframes;
 
-    struct writer_t out;
-    struct writer_t out2;
+    writer_t out;
+    writer_t out2;
 
     ringbuffer_t r;
     videoreader_t* video;
@@ -110,7 +110,7 @@ static void msg(char*format, ...)
     if(!verbose)
        return;
     va_start(arglist, format);
-    vsprintf(buf, format, arglist);
+    vsnprintf(buf, sizeof(buf)-1, format, arglist);
     va_end(arglist);
     l = strlen(buf);
     while(l && buf[l-1]=='\n') {
@@ -337,14 +337,14 @@ static void writeShowTags(v2swf_internal_t* i, int shapeid, int bmid, int width,
     i->showframe = 1;
 }
 
-static int wwrite(struct writer_t*w, void*data, int len)
+static int wwrite(writer_t*w, void*data, int len)
 {
     v2swf_internal_t* i = (v2swf_internal_t*)w->internal;
     ringbuffer_put(&i->r, data, len);
     return len;
 }
 
-static void wfinish(struct writer_t*w)
+static void wfinish(writer_t*w)
 {
     v2swf_internal_t* i = (v2swf_internal_t*)w->internal;
 }
@@ -905,8 +905,8 @@ int v2swf_init(v2swf_t*v2swf, videoreader_t * video)
     i->keyframe = 1;
     i->showframe = 0;
 
-    memset(&i->out, 0, sizeof(struct writer_t));
-    memset(&i->out2, 0, sizeof(struct writer_t));
+    memset(&i->out, 0, sizeof(writer_t));
+    memset(&i->out2, 0, sizeof(writer_t));
 
     return 0;
 }
@@ -1064,7 +1064,7 @@ void v2swf_backpatch(v2swf_t*v2swf, char*filename)
                close(fi);
                fi = open(filename, O_WRONLY|O_BINARY|O_TRUNC|O_CREAT, 0666);
                if(fi>=0) {
-                   swf_WriteSWC(fi, &tmp);
+                   swf_WriteSWF(fi, &tmp);
                    close(fi);
                    msg("v2swf_backpatch %s - fix header: success\n", filename);
                }