H.264 decoder should dlopen SONAME of libva and libva-x11.

content/common/gpu/media/vaapi_wrapper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <dlfcn.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "content/common/gpu/media/vaapi_wrapper.h"
 
@@ skipping 390 matching lines @@
                        false);
   return true;
 }
 
 // static
 bool VaapiWrapper::pre_sandbox_init_done_ = false;
 
 // static
 void VaapiWrapper::PreSandboxInitialization() {
   DCHECK(!pre_sandbox_init_done_);
-  vaapi_handle = dlopen("libva.so", RTLD_NOW);
-  vaapi_x11_handle = dlopen("libva-x11.so", RTLD_NOW);
+  vaapi_handle = dlopen("libva.so.1", RTLD_NOW);
+  vaapi_x11_handle = dlopen("libva-x11.so.1", RTLD_NOW);
   pre_sandbox_init_done_ = vaapi_handle && vaapi_x11_handle;
 }
 
 // static
 bool VaapiWrapper::PostSandboxInitialization() {
   if (!pre_sandbox_init_done_)
     return false;
 #define VAAPI_DLSYM_OR_RETURN_ON_ERROR(name, handle)                          \
   do {                                                                        \
     VAAPI_##name = reinterpret_cast<Vaapi##name>(dlsym((handle), "va"#name)); \
@@ skipping 13 matching lines @@
   VAAPI_DLSYM_OR_RETURN_ON_ERROR(DestroyContext, vaapi_handle);
   VAAPI_DLSYM_OR_RETURN_ON_ERROR(DestroySurfaces, vaapi_handle);
   VAAPI_DLSYM_OR_RETURN_ON_ERROR(DisplayIsValid, vaapi_handle);
   VAAPI_DLSYM_OR_RETURN_ON_ERROR(EndPicture, vaapi_handle);
   VAAPI_DLSYM_OR_RETURN_ON_ERROR(ErrorStr, vaapi_handle);
   VAAPI_DLSYM_OR_RETURN_ON_ERROR(GetConfigAttributes, vaapi_handle);
   VAAPI_DLSYM_OR_RETURN_ON_ERROR(GetDisplay, vaapi_x11_handle);
   VAAPI_DLSYM_OR_RETURN_ON_ERROR(Initialize, vaapi_handle);
   VAAPI_DLSYM_OR_RETURN_ON_ERROR(PutSurface, vaapi_x11_handle);
   VAAPI_DLSYM_OR_RETURN_ON_ERROR(RenderPicture, vaapi_handle);
-  VAAPI_DLSYM_OR_RETURN_ON_ERROR(SyncSurface, vaapi_x11_handle);
+  VAAPI_DLSYM_OR_RETURN_ON_ERROR(SyncSurface, vaapi_handle);
   VAAPI_DLSYM_OR_RETURN_ON_ERROR(Terminate, vaapi_handle);
 #undef VAAPI_DLSYM
 
   return true;
 }
 
 }  // namespace content