media/filters/ffmpeg_demuxer.h - Issue 10879057: Revert changes from r152523 and split bitstream converter creation and enabling.

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/filters/ffmpeg_demuxer.h

Issue 10879057: Revert changes from r152523 and split bitstream converter creation and enabling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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:

View side-by-side diff with in-line comments

Download patch

Index: media/filters/ffmpeg_demuxer.h

diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h

index 6097c6b4f31a665d685efc8175fb1ccb59ba6881..9a96a19e1bb53ee025746f2ac2c1a199f452e576 100644

--- a/media/filters/ffmpeg_demuxer.h

+++ b/media/filters/ffmpeg_demuxer.h

@@ -127,6 +127,7 @@ class FFmpegDemuxerStream : public DemuxerStream {

ReadQueue read_queue_;

scoped_ptr<FFmpegH264ToAnnexBBitstreamConverter> bitstream_converter_;

+ bool bitstream_converter_enabled_;

// Used to synchronize access to |buffer_queue_|, |read_queue_|, and

// |stopped_|. This is so other threads can get access to buffers that have

« no previous file with comments | « no previous file | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »