# HG changeset patch # User reimar # Date 1227717042 0 # Node ID 16b39ef63bb5a0aff7a221fc2787a82944cfb4ce # Parent c06e8f1eec9780e2b1fc49f62c23de28ad15ba59 Use D3DFMT_ constants where possible instead of MAKEFOURCC diff -r c06e8f1eec97 -r 16b39ef63bb5 libvo/vo_direct3d.c --- a/libvo/vo_direct3d.c Wed Nov 26 16:27:39 2008 +0000 +++ b/libvo/vo_direct3d.c Wed Nov 26 16:30:42 2008 +0000 @@ -88,8 +88,8 @@ {IMGFMT_I420, MAKEFOURCC('I','4','2','0')}, {IMGFMT_IYUV, MAKEFOURCC('I','Y','U','V')}, {IMGFMT_YVU9, MAKEFOURCC('Y','V','U','9')}, - {IMGFMT_YUY2, MAKEFOURCC('Y','U','Y','2')}, - {IMGFMT_UYVY, MAKEFOURCC('U','Y','V','Y')}, + {IMGFMT_YUY2, D3DFMT_YUY2}, + {IMGFMT_UYVY, D3DFMT_UYVY}, {IMGFMT_BGR32, D3DFMT_X8R8G8B8}, {IMGFMT_RGB32, D3DFMT_X8B8G8R8}, {IMGFMT_BGR24, D3DFMT_R8G8B8}, //untested