diff options
| author | Zou Nan hai <nanhai.zou@intel.com> | 2008-11-27 10:48:09 +0800 |
|---|---|---|
| committer | Zou Nan hai <nanhai.zou@intel.com> | 2008-11-27 10:48:09 +0800 |
| commit | ec7fd3d1b477928f9bffde1a72d7f3fdea89e629 (patch) | |
| tree | 3fb8388c6795b08c967a41689c658f2bde4398a8 /src/i965_video.c | |
| parent | d978cd4b453ea588ed2fc2f2cb4ec26856fe00d4 (diff) | |
| parent | baec75a56d91546443a2e04812face4997bc764b (diff) | |
Merge branch '965-xvmc'
Conflicts:
src/common.h
src/i830_hwmc.c
src/i830_video.c
Diffstat (limited to 'src/i965_video.c')
| -rw-r--r-- | src/i965_video.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/i965_video.c b/src/i965_video.c index 37eebb33..6c295a6a 100644 --- a/src/i965_video.c +++ b/src/i965_video.c @@ -37,6 +37,7 @@ #include "i830.h" #include "i830_video.h" +#include "i830_hwmc.h" #include "brw_defines.h" #include "brw_structs.h" #include <string.h> @@ -248,6 +249,9 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, src_pitch[0] = video_pitch; n_src_surf = 1; break; +#ifdef INTEL_XVMC + case FOURCC_XVMC: +#endif case FOURCC_I420: case FOURCC_YV12: src_surf_format = BRW_SURFACEFORMAT_R8_UNORM; |