Mercurial > mplayer.hg
changeset 7468:9360e5203200
use img_format.h instead of wine/mmioFOURCC hack
| author | arpi |
|---|---|
| date | Sun, 22 Sep 2002 00:10:31 +0000 |
| parents | 3a22c16fea46 |
| children | f53f1f126a05 |
| files | libmpcodecs/native/cyuv.c |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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 <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;