diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2009-12-01 14:32:29 +0100 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-05-16 19:59:08 +0100 |
| commit | 149e8d5845c6d9a840d92046cf2741e8611a2714 (patch) | |
| tree | f9f4b6b058a3e435043e469a3d64cd85f35ff638 /src/i830_video.c | |
| parent | b6602045dc084ea564688ebad52c4c0ca404a404 (diff) | |
Xv: kill an unnecessary if
We always pass a non-null pointer for crtc_ret, no point to check
for this.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Eric Anholt <eric@anholt.net>
(cherry picked from commit cf74caaa91667457bba3583b216dfc157d09f39e)
Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
Diffstat (limited to 'src/i830_video.c')
| -rw-r--r-- | src/i830_video.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index 0bd3b1c8..3c4a080d 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -2130,26 +2130,25 @@ i830_clip_video_helper(ScrnInfoPtr scrn, Bool ret; RegionRec crtc_region_local; RegionPtr crtc_region = reg; + BoxRec crtc_box; /* * For overlay video, compute the relevant CRTC and * clip video to that */ - if (crtc_ret) { - BoxRec crtc_box; - xf86CrtcPtr crtc = i830_covering_crtc(scrn, dst, - adaptor_priv->desired_crtc, - &crtc_box); - - /* For textured video, we don't actually want to clip at all. */ - if (crtc && !adaptor_priv->textured) { - REGION_INIT(screen, &crtc_region_local, &crtc_box, 1); - crtc_region = &crtc_region_local; - REGION_INTERSECT(screen, crtc_region, crtc_region, - reg); - } - *crtc_ret = crtc; + xf86CrtcPtr crtc = i830_covering_crtc(scrn, dst, + adaptor_priv->desired_crtc, + &crtc_box); + + /* For textured video, we don't actually want to clip at all. */ + if (crtc && !adaptor_priv->textured) { + REGION_INIT(screen, &crtc_region_local, &crtc_box, 1); + crtc_region = &crtc_region_local; + REGION_INTERSECT(screen, crtc_region, crtc_region, + reg); } + *crtc_ret = crtc; + ret = xf86XVClipVideoHelper(dst, xa, xb, ya, yb, crtc_region, width, height); if (crtc_region != reg) |