media/blink/webmediaplayer_impl.cc - Issue 1415793003: fix build when ffmpeg, libvpx and libwebm are disabled

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/blink/webmediaplayer_impl.cc

Issue 1415793003: fix build when ffmpeg, libvpx and libwebm are disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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/blink/webmediaplayer_impl.cc

diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc

index 5be9452d38f572d1cd0acb5b9da0f1a7499771ce..52122d568221bbe80d497b56cdaeef5e02ced5e3 100644

--- a/media/blink/webmediaplayer_impl.cc

+++ b/media/blink/webmediaplayer_impl.cc

@@ -958,8 +958,13 @@ void WebMediaPlayerImpl::StartPipeline() {

DCHECK(!chunk_demuxer_);

DCHECK(data_source_);

+#if !defined(MEDIA_DISABLE_FFMPEG)

demuxer_.reset(new FFmpegDemuxer(media_task_runner_, data_source_.get(),

encrypted_media_init_data_cb, media_log_));

+#else

+ OnPipelineError(PipelineStatus::DEMUXER_ERROR_COULD_NOT_OPEN);

+ return;

+#endif

} else {

DCHECK(!chunk_demuxer_);

DCHECK(!data_source_);

« no previous file with comments | « media/BUILD.gn ('k') | media/media.gyp » ('j') | no next file with comments »