# HG changeset patch # User arpi # Date 1032653431 0 # Node ID 9360e520320009ac0d98d59264692935f7aee50e # Parent 3a22c16fea466c14e42da47e9a70dae95778802a use img_format.h instead of wine/mmioFOURCC hack diff -r 3a22c16fea46 -r 9360e5203200 libmpcodecs/native/cyuv.c --- a/libmpcodecs/native/cyuv.c Sat Sep 21 23:23:03 2002 +0000 +++ b/libmpcodecs/native/cyuv.c Sun Sep 22 00:10:31 2002 +0000 @@ -21,7 +21,7 @@ #include #include -#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;