[vlc-commits] commit: Check "xlib" before trying vaapi. (Laurent Aimar )

[git at videolan.org]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Thu Jun  3 20:57:47 2010 +0200| [faca3e7c1b56dcb2e26ee82d55ea55f4ee2316d3] | committer: Laurent Aimar 

Check "xlib" before trying vaapi.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=faca3e7c1b56dcb2e26ee82d55ea55f4ee2316d3
---

 modules/codec/avcodec/video.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index b0b3a8e..d88fc26 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -1173,6 +1173,11 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_codec,
         /* Only VLD supported */
         if( pi_fmt[i] == PIX_FMT_VAAPI_VLD )
         {
+            if( !var_InheritBool( p_dec, "xlib" ) )
+            {
+                msg_Warn( p_dec, "Ignoring VA API" );
+                continue;
+            }
 #ifdef HAVE_AVCODEC_VAAPI
             msg_Dbg( p_dec, "Trying VA API" );
             p_sys->p_va = vlc_va_NewVaapi( p_sys->i_codec_id );