diff options
author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-01-05 16:26:49 +0100 |
---|---|---|
committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-01-06 10:59:19 +0100 |
commit | 9df1027ed9ae2e8874097e9ebf80a6038fb164d3 (patch) | |
tree | 86383740b630748ba6d24b93294578cceaf31299 | |
parent | df720ca10e74d0944b801a3491412fe277eecfea (diff) | |
download | gstreamer-vaapi-9df1027ed9ae2e8874097e9ebf80a6038fb164d3.tar.gz |
vaapidecode: fix deinitialization order.
-rw-r--r-- | gst/vaapi/gstvaapidecode.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c index 970f9bbc..82a96c7b 100644 --- a/gst/vaapi/gstvaapidecode.c +++ b/gst/vaapi/gstvaapidecode.c @@ -304,17 +304,6 @@ gst_vaapidecode_create(GstVaapiDecode *decode, GstCaps *caps) static void gst_vaapidecode_destroy(GstVaapiDecode *decode) { - if (decode->decoder_ready) { - gst_vaapidecode_release(decode, NULL); - g_cond_free(decode->decoder_ready); - decode->decoder_ready = NULL; - } - - if (decode->decoder_mutex) { - g_mutex_free(decode->decoder_mutex); - decode->decoder_mutex = NULL; - } - if (decode->decoder) { gst_vaapi_decoder_put_buffer(decode->decoder, NULL); g_object_unref(decode->decoder); @@ -325,6 +314,17 @@ gst_vaapidecode_destroy(GstVaapiDecode *decode) gst_caps_unref(decode->decoder_caps); decode->decoder_caps = NULL; } + + if (decode->decoder_ready) { + gst_vaapidecode_release(decode, NULL); + g_cond_free(decode->decoder_ready); + decode->decoder_ready = NULL; + } + + if (decode->decoder_mutex) { + g_mutex_free(decode->decoder_mutex); + decode->decoder_mutex = NULL; + } } static gboolean |