[Mplayer-cvslog] CVS: main dec_video.c,1.69,1.70 codec-cfg.c,1.47,1.48 codec-cfg.h,1.23,1.24

[Mike Melanson]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv19772

Modified Files:
	dec_video.c codec-cfg.c codec-cfg.h 
Log Message:
support for FLI image decoding


Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- dec_video.c	27 Nov 2001 16:55:12 -0000	1.69
+++ dec_video.c	28 Nov 2001 01:35:55 -0000	1.70
@@ -123,6 +123,15 @@
   unsigned char *palette_map,
   int bytes_per_pixel);
 
+void AVI_Decode_Fli(
+  unsigned char *encoded,
+  int encoded_size,
+  unsigned char *decoded,
+  int width,
+  int height,
+  int bytes_per_pixel);
+
+
 //**************************************************************************//
 //             The OpenDivX stuff:
 //**************************************************************************//
@@ -556,6 +565,12 @@
      (char*)memalign(64, sh_video->disp_w*sh_video->disp_h*bpp); // FIXME!!!
    }
    break;
+ case VFM_FLI: {
+   int bpp=((out_fmt&255)+7)/8; // RGB only
+   sh_video->our_out_buffer = 
+     (char*)memalign(64, sh_video->disp_w*sh_video->disp_h*bpp); // FIXME!!!
+   }
+   break;
  }
 }
   sh_video->inited=1;
@@ -803,6 +818,13 @@
         start, in_size, sh_video->our_out_buffer,
         sh_video->disp_w, sh_video->disp_h,
         (char *)sh_video->bih+40, ((out_fmt&255)+7)/8);
+    blit_frame = 3;
+    break;
+  case VFM_FLI:
+      AVI_Decode_Fli(
+        start, in_size, sh_video->our_out_buffer,
+        sh_video->disp_w, sh_video->disp_h,
+        ((out_fmt&255)+7)/8);
     blit_frame = 3;
     break;
 } // switch

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- codec-cfg.c	14 Nov 2001 11:16:45 -0000	1.47
+++ codec-cfg.c	28 Nov 2001 01:35:55 -0000	1.48
@@ -228,6 +228,7 @@
 		"rle",
 		"xanim",
 		"msvidc",
+		"fli",
 		NULL
 	};
         char **drv=audioflag?audiodrv:videodrv;

Index: codec-cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- codec-cfg.h	11 Nov 2001 13:35:00 -0000	1.23
+++ codec-cfg.h	28 Nov 2001 01:35:55 -0000	1.24
@@ -43,6 +43,7 @@
 #define VFM_RLE 9
 #define VFM_XANIM 10
 #define VFM_MSVIDC 11
+#define VFM_FLI 12
 
 #ifndef GUID_TYPE
 #define GUID_TYPE