summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/vdpau/device.c
diff options
context:
space:
mode:
authorChristian König <[email protected]>2011-04-03 22:01:15 +0200
committerChristian König <[email protected]>2011-04-03 22:01:15 +0200
commitebd564587a46891cb2729c6a0ed84b7c27dc23ec (patch)
tree2b17c8209f712cd2e7d659fb1003ef5fa78814e6 /src/gallium/state_trackers/vdpau/device.c
parent087e17f52e6391cecc002066f53dadc8f1b53074 (diff)
g3dvl/vdpau: some more indention fixes
Diffstat (limited to 'src/gallium/state_trackers/vdpau/device.c')
-rw-r--r--src/gallium/state_trackers/vdpau/device.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/vdpau/device.c b/src/gallium/state_trackers/vdpau/device.c
index 0f9b7b6f5d8..d3314d0d4bf 100644
--- a/src/gallium/state_trackers/vdpau/device.c
+++ b/src/gallium/state_trackers/vdpau/device.c
@@ -32,7 +32,6 @@
#include <util/u_debug.h>
#include "vdpau_private.h"
-
PUBLIC VdpStatus
vdp_imp_device_create_x11(Display *display, int screen, VdpDevice *device,
VdpGetProcAddress **get_proc_address)
@@ -57,8 +56,7 @@ vdp_imp_device_create_x11(Display *display, int screen, VdpDevice *device,
dev->display = display;
dev->screen = screen;
dev->vscreen = vl_screen_create(display, screen);
- if (!dev->vscreen)
- {
+ if (!dev->vscreen) {
ret = VDP_STATUS_RESOURCES;
goto no_vscreen;
}
@@ -107,14 +105,14 @@ vlVdpPresentationQueueTargetCreateX11(VdpDevice device, Drawable drawable,
pqt->device = dev;
pqt->drawable = drawable;
- *target = vlAddDataHTAB(pqt);
+ *target = vlAddDataHTAB(pqt);
if (*target == 0) {
ret = VDP_STATUS_ERROR;
goto no_handle;
}
-
return VDP_STATUS_OK;
+
no_handle:
FREE(dev);
return ret;
@@ -191,5 +189,6 @@ vlVdpGetErrorString (VdpStatus status)
all supplied surfaces must have been created within the context of the same VdpDevice object. \
This error is raised if they were not.");
_ERROR_TYPE(VDP_STATUS_ERROR,"A catch-all error, used when no other error code applies.");
+ default: return "Unknown Error";
}
}