diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-08-15 17:26:39 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-08-15 17:26:39 -0400 |
| commit | 9a9917e89144923a79acaf8745ba7b958feda2a4 (patch) | |
| tree | 46b8383d03acd11adb6d085abd32b44e5913da63 /sys | |
| parent | e46ff7bda0f7996b456476dccb4a822688a690fb (diff) | |
| parent | 2aa6fa29edf380a40c962a85aad3501950c71492 (diff) | |
| download | gst-plugins-bad-9a9917e89144923a79acaf8745ba7b958feda2a4.tar.gz gst-plugins-bad-9a9917e89144923a79acaf8745ba7b958feda2a4.tar.bz2 gst-plugins-bad-9a9917e89144923a79acaf8745ba7b958feda2a4.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/vdpau/gstvdp.c | 8 | ||||
| -rw-r--r-- | sys/vdpau/gstvdpdevice.c | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/sys/vdpau/gstvdp.c b/sys/vdpau/gstvdp.c index 5c524968..0cafbd68 100644 --- a/sys/vdpau/gstvdp.c +++ b/sys/vdpau/gstvdp.c @@ -12,12 +12,14 @@ static gboolean vdpau_init (GstPlugin * vdpau_plugin) { + /* Before giving these elements a rank again, make sure they pass at + * least the generic/states test when there's no device available */ gst_element_register (vdpau_plugin, "vdpaumpegdec", - GST_RANK_PRIMARY - 1, GST_TYPE_VDP_MPEG_DEC); + GST_RANK_NONE, GST_TYPE_VDP_MPEG_DEC); gst_element_register (vdpau_plugin, "vdpauvideoyuv", - GST_RANK_PRIMARY, GST_TYPE_VDP_VIDEO_YUV); + GST_RANK_NONE, GST_TYPE_VDP_VIDEO_YUV); gst_element_register (vdpau_plugin, "vdpauyuvvideo", - GST_RANK_PRIMARY, GST_TYPE_VDP_YUV_VIDEO); + GST_RANK_NONE, GST_TYPE_VDP_YUV_VIDEO); return TRUE; } 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); } |