media/tools/player_x11/player_x11.cc - Issue 10669022: Add status parameter to DemuxerStream::ReadCB

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/tools/player_x11/player_x11.cc

Issue 10669022: Add status parameter to DemuxerStream::ReadCB (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: media/tools/player_x11/player_x11.cc

diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc

index bc8ef380bfc48de68bb2df030751956bd2a56052..83e12eff5f61b1cf9d97e280e535027bd4d96cce 100644

--- a/media/tools/player_x11/player_x11.cc

+++ b/media/tools/player_x11/player_x11.cc

@@ -2,8 +2,6 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include <X11/XKBlib.h>

-#include <X11/Xlib.h>

#include <signal.h>

#include <iostream> // NOLINT

@@ -31,6 +29,12 @@

#include "media/filters/file_data_source.h"

#include "media/filters/video_renderer_base.h"

#include "media/tools/player_x11/data_source_logger.h"

+// Include X11 headers here because X11/Xlib.h #define's Status

+// which causes compiler errors with Status enum declarations

+// in media::DemuxerStream & media::AudioDecoder.

+#include <X11/XKBlib.h>

+#include <X11/Xlib.h>

#include "media/tools/player_x11/gl_video_renderer.h"

#include "media/tools/player_x11/x11_video_renderer.h"

« no previous file with comments | « media/filters/gpu_video_decoder.cc ('k') | media/tools/seek_tester/seek_tester.cc » ('j') | no next file with comments »