From: Laurent Aimar Date: Mon, 19 Jul 2010 18:02:45 +0000 (+0200) Subject: Revert "Called XInitThreads in vaapi." X-Git-Tag: 1.2.0-pre1~5754 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2797ca1c04ec91cd293293f998badcb0d7f944be;p=vlc Revert "Called XInitThreads in vaapi." This reverts commit 7c93516a555e29c51f0a191b0c64daf65b029583. It is useless as 6adc39614a933e6d7cdc187963532de8573c1312 added it already. --- diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c index de0de4c603..44148233d4 100644 --- a/modules/codec/avcodec/vaapi.c +++ b/modules/codec/avcodec/vaapi.c @@ -133,9 +133,6 @@ static int Open( vlc_va_vaapi_t *p_va, int i_codec_id ) p_va->image.image_id = VA_INVALID_ID; /* Create a VA display */ - if( !XInitThreads() ) - return VLC_EGENERIC; - p_va->p_display_x11 = XOpenDisplay(NULL); if( !p_va->p_display_x11 ) goto error; @@ -489,6 +486,7 @@ vlc_va_t *vlc_va_NewVaapi( int i_codec_id ) vlc_va_vaapi_t *p_va = calloc( 1, sizeof(*p_va) ); if( !p_va ) return NULL; + if( Open( p_va, i_codec_id ) ) { free( p_va );