[Mplayer-cvslog] CVS: main/libmpcodecs/native cyuv.c,1.2,1.3

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpcodecs/native
In directory mail:/var/tmp.root/cvs-serv15088

Modified Files:
	cyuv.c 
Log Message:
use img_format.h instead of wine/mmioFOURCC hack


Index: cyuv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/native/cyuv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cyuv.c	26 Mar 2002 05:03:09 -0000	1.2
+++ cyuv.c	22 Sep 2002 00:10:31 -0000	1.3
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "loader/wine/avifmt.h" // for mmioFOURCC macro
+#include "img_format.h"
 
 /* ------------------------------------------------------------------------
  * This function decodes a buffer containing a CYUV encoded frame.
@@ -50,7 +50,7 @@
 				cur_U = *(ptr++);
 				cur_Y = (cur_U & 0x0f) << 4;
 				cur_U = cur_U & 0xf0;
-				if (format == mmioFOURCC('Y','U','Y','2'))
+				if (format == IMGFMT_YUY2)
 					{
 					*frame++ = cur_Y;
 					*frame++ = cur_U;
@@ -64,7 +64,7 @@
 				cur_V = *(ptr++);
 				cur_Y = (cur_Y + delta_y_tbl[cur_V & 0x0f]) & 0xff;
 				cur_V = cur_V & 0xf0;
-				if (format == mmioFOURCC('Y','U','Y','2'))
+				if (format == IMGFMT_YUY2)
 					{
 					*frame++ = cur_Y;
 					*frame++ = cur_V;
@@ -80,7 +80,7 @@
 				i = *(ptr++);
 				cur_U = (cur_U + delta_c_tbl[i >> 4]) & 0xff;
 				cur_Y = (cur_Y + delta_y_tbl[i & 0x0f]) & 0xff;
-				if (format == mmioFOURCC('Y','U','Y','2'))
+				if (format == IMGFMT_YUY2)
 					{
 					*frame++ = cur_Y;
 					*frame++ = cur_U;
@@ -94,7 +94,7 @@
 				i = *(ptr++);
 				cur_V = (cur_V + delta_c_tbl[i >> 4]) & 0xff;
 				cur_Y = (cur_Y + delta_y_tbl[i & 0x0f]) & 0xff;
-				if (format == mmioFOURCC('Y','U','Y','2'))
+				if (format == IMGFMT_YUY2)
 					{
 					*frame++ = cur_Y;
 					*frame++ = cur_V;
@@ -108,7 +108,7 @@
 
 			i = *(ptr++);
 			cur_Y = (cur_Y + delta_y_tbl[i & 0x0f]) & 0xff;
-			if (format == mmioFOURCC('Y','U','Y','2'))
+			if (format == IMGFMT_YUY2)
 				{
 				*frame++ = cur_Y;
 				*frame++ = cur_U;
@@ -120,7 +120,7 @@
 				}
 
 			cur_Y = (cur_Y + delta_y_tbl[i >> 4]) & 0xff;
-			if (format == mmioFOURCC('Y','U','Y','2'))
+			if (format == IMGFMT_YUY2)
 				{
 				*frame++ = cur_Y;
 				*frame++ = cur_V;