diff options
| author | Maciej Cencora <m.cencora@gmail.com> | 2009-11-23 22:14:48 +0100 |
|---|---|---|
| committer | Maciej Cencora <m.cencora@gmail.com> | 2009-11-23 22:14:48 +0100 |
| commit | 5173d14cb5821637f22247d16be1b970f3762d6a (patch) | |
| tree | e93826ec799fdbe513592e253278545e2584a7bf /src/gallium/state_trackers/xorg/xorg_xv.c | |
| parent | 18384af7491c408c4182b72807b02c11b55509f8 (diff) | |
| parent | 960464e42dce138fde11c379ce7744bc4be14aa2 (diff) | |
Merge commit 'origin/mesa_7_7_branch'
Diffstat (limited to 'src/gallium/state_trackers/xorg/xorg_xv.c')
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_xv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_xv.c b/src/gallium/state_trackers/xorg/xorg_xv.c index 76cd3ac1aa..4a701e93ec 100644 --- a/src/gallium/state_trackers/xorg/xorg_xv.c +++ b/src/gallium/state_trackers/xorg/xorg_xv.c @@ -447,7 +447,7 @@ display_video(ScrnInfoPtr pScrn, struct xorg_xv_port_priv *pPriv, int id, int x, y, w, h; struct exa_pixmap_priv *dst = exaGetPixmapDriverPrivate(pPixmap); - if (!dst->tex) { + if (dst && !dst->tex) { xorg_exa_set_shared_usage(pPixmap); pScrn->pScreen->ModifyPixmapHeader(pPixmap, 0, 0, 0, 0, 0, NULL); } |