diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-03 21:39:42 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-03 21:39:42 +0000 |
commit | d2970673eb08326b1f8f639a2a7ab3e873e3b6c3 (patch) | |
tree | 2bf0e5f43589b2f841d0a081aa4e2b59a60e00fa /media/tools/player_x11/player_x11.cc | |
parent | cfbe8e44e66cdac1d9fd259b66bb0e70dcca84d9 (diff) | |
download | chromium_src-d2970673eb08326b1f8f639a2a7ab3e873e3b6c3.zip chromium_src-d2970673eb08326b1f8f639a2a7ab3e873e3b6c3.tar.gz chromium_src-d2970673eb08326b1f8f639a2a7ab3e873e3b6c3.tar.bz2 |
Fixing some subtle issues with player_x11 and GL/GLES video renderers.
BUG=n/a
TEST=n/a
Review URL: http://codereview.chromium.org/665008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40539 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools/player_x11/player_x11.cc')
-rw-r--r-- | media/tools/player_x11/player_x11.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index 24ba556..69d7fc5 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -25,12 +25,14 @@ #if defined(RENDERER_GL) #include "media/tools/player_x11/gl_video_renderer.h" typedef GlVideoRenderer Renderer; -#elif RENDERER_GLES +#elif defined(RENDERER_GLES) #include "media/tools/player_x11/gles_video_renderer.h" typedef GlesVideoRenderer Renderer; -#elif RENDERER_X11 +#elif defined(RENDERER_X11) #include "media/tools/player_x11/x11_video_renderer.h" typedef X11VideoRenderer Renderer; +#else +#error No video renderer defined. #endif Display* g_display = NULL; |