Merge pull request #635 from wolfman2000/wolf-libva-builtin

Try to not need WITH_LIBVA.

CMake/DefineOptions.cmake

@@ -34,7 +34,6 @@ else()
     # Builder beware: later versions of ffmpeg may break!
     option(WITH_SYSTEM_FFMPEG "Build with the system's FFMPEG." OFF)
     option(WITH_CRYSTALHD_DISABLED "Build FFMPEG without Crystal HD support." OFF)
-    option(WITH_LIBVA "Build with libVa support for Video Acceleration." OFF)
     option(WITH_TTY "Build with Linux TTY Input Support." OFF)
     option(WITH_PROFILING "Build with Profiling Support." OFF)
     option(WITH_GLES2 "Build with OpenGL ES 2.0 Support." ON)

CMakeLists.txt

@@ -255,11 +255,9 @@ elseif(LINUX)
     set(WITH_FFMPEG OFF)
   endif()
 
-  if(WITH_FFMPEG)
+  find_package("Va")
-    if(WITH_LIBVA)
-      find_package("Va")
-    endif()
 
+  if(WITH_FFMPEG)
     if (WITH_SYSTEM_FFMPEG)
       find_package("FFMPEG")
       if(NOT FFMPEG_FOUND)

src/CMakeLists.txt

@@ -477,7 +477,7 @@ else() # Unix / Linux
       )
     endif()
 
-    if(WITH_LIBVA AND VA_FOUND)
+    if(VA_FOUND)
       list(APPEND SMDATA_LINK_LIB ${VA_LIBRARY})
     endif()
   endif()