From 3e770482e133ffce30534c46795da19e8fec0e97 Mon Sep 17 00:00:00 2001
From: kramm <kramm>
Date: Thu, 6 Jun 2002 10:57:05 +0000
Subject: [PATCH] implement avifile 7 compatibility.

---
 avi2swf/avi2swf.cc |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/avi2swf/avi2swf.cc b/avi2swf/avi2swf.cc
index 3c63920..5c1d0d2 100644
--- a/avi2swf/avi2swf.cc
+++ b/avi2swf/avi2swf.cc
@@ -14,7 +14,7 @@ extern "C" {
 #include "../lib/args.h"
 }
 #include <avifile/version.h>
-#if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION==6) 
+#if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION>=6) 
    #include <avifile.h>
    #include <aviplay.h>
    #include <fourcc.h>
@@ -754,7 +754,8 @@ int main (int argc,char ** argv)
     {
 	int x,y;
 	for(y=0;y<yblocksize;y++) {
-#ifdef VERSION6
+	    /* avifile 0.6 returns images upside down. versoins 5 and >=7 don't */
+#if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION==6) 
 	    U8*mydata = img->At(oldheight-(int)((yy*yblocksize+y)*reziscale));
 #else
 	    U8*mydata = img->At((int)((yy*yblocksize+y)*reziscale));
-- 
1.7.10.4