Avcodec: deactivate DR for Camtasia

[vlc] / modules / codec / avcodec / vaapi.c

diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
index 44148233d44335c081c63f27f58bb37a29c360eb..710fddd1d1a5898c07142b579fb05e650b1cf983 100644 (file)
--- a/modules/codec/avcodec/vaapi.c
+++ b/modules/codec/avcodec/vaapi.c
@@ -31,8 +31,6 @@
 
 #ifdef HAVE_LIBAVCODEC_AVCODEC_H
 #   include <libavcodec/avcodec.h>
-#elif defined(HAVE_FFMPEG_AVCODEC_H)
-#   include <ffmpeg/avcodec.h>
 #else
 #   include <avcodec.h>
 #endif
@@ -43,6 +41,8 @@
 
 #ifdef HAVE_AVCODEC_VAAPI
 
+#include <vlc_xlib.h>
+
 #include <libavcodec/vaapi.h>
 
 #include <X11/Xlib.h>
@@ -473,14 +473,9 @@ static void Delete( vlc_va_t *p_external )
 }
 
 /* */
-vlc_va_t *vlc_va_NewVaapi( int i_codec_id )
+vlc_va_t *vlc_va_NewVaapi( vlc_object_t *obj, int i_codec_id )
 {
-    bool fail;
-
-    vlc_global_lock( VLC_XLIB_MUTEX );
-    fail = !XInitThreads();
-    vlc_global_unlock( VLC_XLIB_MUTEX );
-    if( unlikely(fail) )
+    if( !vlc_xlib_init( obj ) )
         return NULL;
 
     vlc_va_vaapi_t *p_va = calloc( 1, sizeof(*p_va) );
@@ -502,8 +497,9 @@ vlc_va_t *vlc_va_NewVaapi( int i_codec_id )
     return &p_va->va;
 }
 #else
-vlc_va_t *vlc_va_NewVaapi( int i_codec_id )
+vlc_va_t *vlc_va_NewVaapi( vlc_object_t *obj, int i_codec_id )
 {
+    VLC_UNUSED( obj );
     VLC_UNUSED( i_codec_id );
     return NULL;
 }