diff options
| author | Christian König <christian.koenig@amd.com> | 2014-08-13 15:49:18 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2014-08-14 11:57:07 +0200 |
| commit | 6fb42ee7a632e181160ac4be234b30e50a1b91d5 (patch) | |
| tree | 962b6f4da56cdc0d8791f65177a4ce111dc0a966 /src/gallium/state_trackers/vdpau/decode.c | |
| parent | c1df492d03862f75698ba5d50d4f46cd528ffc0d (diff) | |
| download | external_mesa3d-6fb42ee7a632e181160ac4be234b30e50a1b91d5.zip external_mesa3d-6fb42ee7a632e181160ac4be234b30e50a1b91d5.tar.gz external_mesa3d-6fb42ee7a632e181160ac4be234b30e50a1b91d5.tar.bz2 | |
st/vdpau: add device reference counting
This fixes an issue with flash where it tries to destroy a decoder
after already destroying the device associated with the decoder.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=82517
Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (limited to 'src/gallium/state_trackers/vdpau/decode.c')
| -rw-r--r-- | src/gallium/state_trackers/vdpau/decode.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/vdpau/decode.c b/src/gallium/state_trackers/vdpau/decode.c index 1e5f81e..767d311 100644 --- a/src/gallium/state_trackers/vdpau/decode.c +++ b/src/gallium/state_trackers/vdpau/decode.c @@ -110,7 +110,7 @@ vlVdpDecoderCreate(VdpDevice device, return VDP_STATUS_RESOURCES; } - vldecoder->device = dev; + DeviceReference(&vldecoder->device, dev); templat.entrypoint = PIPE_VIDEO_ENTRYPOINT_BITSTREAM; templat.chroma_format = PIPE_VIDEO_CHROMA_FORMAT_420; @@ -141,6 +141,7 @@ error_handle: error_decoder: pipe_mutex_unlock(dev->mutex); + DeviceReference(&vldecoder->device, NULL); FREE(vldecoder); return ret; } @@ -163,6 +164,7 @@ vlVdpDecoderDestroy(VdpDecoder decoder) pipe_mutex_destroy(vldecoder->mutex); vlRemoveDataHTAB(decoder); + DeviceReference(&vldecoder->device, NULL); FREE(vldecoder); return VDP_STATUS_OK; |