diff options
author | Dave Robillard <dave@drobilla.net> | 2009-08-15 17:26:43 -0400 |
---|---|---|
committer | Dave Robillard <dave@drobilla.net> | 2009-08-15 17:26:43 -0400 |
commit | ef06c438a55b251baa82761a26d6abc4a06382a8 (patch) | |
tree | 061f3a0fbcd3ad56a68a2520f160f76eab707680 /sys/vdpau/gstvdpdevice.c | |
parent | e937d82162aa78a7aa88874f0eb12c895fffd7b7 (diff) | |
parent | 9a9917e89144923a79acaf8745ba7b958feda2a4 (diff) | |
download | gst-plugins-bad-ef06c438a55b251baa82761a26d6abc4a06382a8.tar.gz gst-plugins-bad-ef06c438a55b251baa82761a26d6abc4a06382a8.tar.bz2 gst-plugins-bad-ef06c438a55b251baa82761a26d6abc4a06382a8.zip |
Merge branch 'fdo' into lv2
Diffstat (limited to 'sys/vdpau/gstvdpdevice.c')
-rw-r--r-- | sys/vdpau/gstvdpdevice.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/vdpau/gstvdpdevice.c b/sys/vdpau/gstvdpdevice.c index 4ed1b177..f4eb821d 100644 --- a/sys/vdpau/gstvdpdevice.c +++ b/sys/vdpau/gstvdpdevice.c @@ -49,9 +49,16 @@ gst_vdp_device_finalize (GObject * object) { GstVdpDevice *device = (GstVdpDevice *) object; - device->vdp_device_destroy (device->device); - XCloseDisplay (device->display); + if (device->device != VDP_INVALID_HANDLE) { + device->vdp_device_destroy (device->device); + device->device = VDP_INVALID_HANDLE; + } + if (device->display) { + XCloseDisplay (device->display); + device->display = NULL; + } g_free (device->display_name); + device->display_name = NULL; G_OBJECT_CLASS (gst_vdp_device_parent_class)->finalize (object); } |