Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Daniel Vetter 2009-12-01 14:32:29 +01:00 committed by Eric Anholt
parent d8353c737b
commit cf74caaa91
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/i830_video.c
View File

@ -1218,26 +1218,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);
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;
/* 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)