diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 23:08:19 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 23:08:19 +0000 |
| commit | 0e19c31909fbee9c0481e68af3f0cd1ecea42460 (patch) | |
| tree | ed20083affd6f71ff7246a8d4904ea267066a4a0 | |
| parent | 857cd1a1961189cfa9309876cf9b9ec4b538e3ad (diff) | |
| download | chromium_src-0e19c31909fbee9c0481e68af3f0cd1ecea42460.zip chromium_src-0e19c31909fbee9c0481e68af3f0cd1ecea42460.tar.gz chromium_src-0e19c31909fbee9c0481e68af3f0cd1ecea42460.tar.bz2 | |
Merge 157813 - Fix the test for failed eglQuerySurfacePointerANGLE in DXVA.
BUG=151038
Review URL: https://chromiumcodereview.appspot.com/10959021
TBR=fischman@chromium.org
Review URL: https://codereview.chromium.org/10990009
git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@158438 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/common/gpu/media/dxva_video_decode_accelerator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/common/gpu/media/dxva_video_decode_accelerator.cc b/content/common/gpu/media/dxva_video_decode_accelerator.cc index 11424ee..e3dd19b 100644 --- a/content/common/gpu/media/dxva_video_decode_accelerator.cc +++ b/content/common/gpu/media/dxva_video_decode_accelerator.cc @@ -295,7 +295,7 @@ linked_ptr<DXVAVideoDecodeAccelerator::DXVAPictureBuffer> EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE, &share_handle); - RETURN_ON_FAILURE(share_handle || ret != EGL_TRUE, + RETURN_ON_FAILURE(share_handle && ret == EGL_TRUE, "Failed to query ANGLE surface pointer", linked_ptr<DXVAPictureBuffer>(NULL)); |