Merge.

1 files changed, 18 insertions, 7 deletions

diff --git a/src/video_out/video_out_vaapi.c b/src/video_out/video_out_vaapi.c
index ade498d3a..6f0b5c1b8 100644
--- a/src/video_out/video_out_vaapi.c
+++ b/src/video_out/video_out_vaapi.c
@@ -72,6 +72,12 @@
 
 #include "accel_vaapi.h"
 
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <mem.h>
+#else
+#  include <libavutil/mem.h>
+#endif
+
 #ifndef VA_SURFACE_ATTRIB_SETTABLE
 #define vaCreateSurfaces(d, f, w, h, s, ns, a, na) \
     vaCreateSurfaces(d, w, h, f, ns, s)
@@ -1637,7 +1643,7 @@ static void vaapi_property_callback (void *property_gen, xine_cfg_entry_t *entry
 
   lprintf("vaapi_property_callback property=%d, value=%d\n", property->type, entry->num_value );
 
-  VAStatus vaStatus = vaSetDisplayAttributes(va_context->va_display, &attr, 1);
+  /*VAStatus vaStatus = */ vaSetDisplayAttributes(va_context->va_display, &attr, 1);
   //vaapi_check_status((vo_driver_t *)this, vaStatus, "vaSetDisplayAttributes()");
 
   vaapi_show_display_props((vo_driver_t*)this);
@@ -1769,7 +1775,7 @@ static void vaapi_display_attribs(vo_driver_t *this_gen) {
 static void vaapi_set_background_color(vo_driver_t *this_gen) {
   vaapi_driver_t      *this = (vaapi_driver_t *)this_gen;
   ff_vaapi_context_t  *va_context = this->va_context;
-  VAStatus            vaStatus;
+  //VAStatus            vaStatus;
 
   if(!va_context->valid_context)
     return;
@@ -1780,7 +1786,7 @@ static void vaapi_set_background_color(vo_driver_t *this_gen) {
   attr.type  = VADisplayAttribBackgroundColor;
   attr.value = 0x000000;
 
-  vaStatus = vaSetDisplayAttributes(va_context->va_display, &attr, 1);
+  /*vaStatus =*/ vaSetDisplayAttributes(va_context->va_display, &attr, 1);
   //vaapi_check_status(this_gen, vaStatus, "vaSetDisplayAttributes()");
 }
 
@@ -3677,13 +3683,12 @@ static int vaapi_gui_data_exchange (vo_driver_t *this_gen,
   return 0;
 }
 
-static void vaapi_dispose (vo_driver_t *this_gen) {
+static void vaapi_dispose_locked (vo_driver_t *this_gen) {
   vaapi_driver_t      *this = (vaapi_driver_t *) this_gen;
   ff_vaapi_context_t  *va_context = this->va_context;
 
-  lprintf("vaapi_dispose\n");
+  // vaapi_lock is locked at this point, either from vaapi_dispose or vaapi_open_plugin
 
-  pthread_mutex_lock(&this->vaapi_lock);
   DO_LOCKDISPLAY;
 
   this->ovl_yuv2rgb->dispose(this->ovl_yuv2rgb);
@@ -3713,6 +3718,12 @@ static void vaapi_dispose (vo_driver_t *this_gen) {
   free (this);
 }
 
+static void vaapi_dispose (vo_driver_t *this_gen) {
+  lprintf("vaapi_dispose\n");
+  pthread_mutex_lock(&((vaapi_driver_t *)this_gen)->vaapi_lock);
+  vaapi_dispose_locked(this_gen);
+}
+
 static void vaapi_vdr_osd_width_flag( void *this_gen, xine_cfg_entry_t *entry )
 {
   vaapi_driver_t  *this  = (vaapi_driver_t *) this_gen;
@@ -3971,7 +3982,7 @@ static vo_driver_t *vaapi_open_plugin (video_driver_class_t *class_gen, const vo
   this->va_context->last_sub_image_fmt       = 0;
 
   if(vaapi_init_internal((vo_driver_t *)this, SW_CONTEXT_INIT_FORMAT, SW_WIDTH, SW_HEIGHT, 0) != VA_STATUS_SUCCESS) {
-    vaapi_dispose((vo_driver_t *)this);
+    vaapi_dispose_locked((vo_driver_t *)this);
     return NULL;
   }
   vaapi_close((vo_driver_t *)this);