From: kramm <kramm>
Date: Fri, 6 Jan 2006 20:37:13 +0000 (+0000)
Subject: fourcc -> avm_fourcc
X-Git-Tag: release-0-8-0~274
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=d8cf9dbe80a3b21f0be51c358a74e7b9c7884814

fourcc -> avm_fourcc
---

diff --git a/avi2swf/videoreader_avifile.cc b/avi2swf/videoreader_avifile.cc
index e37d167..371835d 100644
--- a/avi2swf/videoreader_avifile.cc
+++ b/avi2swf/videoreader_avifile.cc
@@ -39,8 +39,8 @@
 #if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION>=6) 
    #include <avifile.h>
    #include <aviplay.h>
-   #include <fourcc.h>
-   #include <creators.h>
+   #include <avm_fourcc.h>
+   #include <avm_creators.h>
    #include <StreamInfo.h>
    #define VERSION6
 #else
diff --git a/m4/avi2swf.m4 b/m4/avi2swf.m4
index 211846b..7ba5532 100644
--- a/m4/avi2swf.m4
+++ b/m4/avi2swf.m4
@@ -38,8 +38,8 @@ $HAVE_AVIFILE_VERSION_H_DEFINE
 #if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION>=6) 
    #include <avifile.h>
    #include <aviplay.h>
-   #include <fourcc.h>
-   #include <creators.h>
+   #include <avm_fourcc.h>
+   #include <avm_creators.h>
    #include <StreamInfo.h>
    #define VERSION6
 #else