Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1681)

Unified Diff: content/renderer/media/audio_decoder.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: content/renderer/media/audio_decoder.cc
diff --git a/content/renderer/media/audio_decoder.cc b/content/renderer/media/audio_decoder.cc
index c413bb08020ae0fc9ff3f940fabc306dfe77bc79..805ff036dd9bf6f2f2674da65d4654ea8bf0633f 100644
--- a/content/renderer/media/audio_decoder.cc
+++ b/content/renderer/media/audio_decoder.cc
@@ -31,6 +31,7 @@ bool DecodeAudioFileData(
if (!destination_bus)
return false;
+#if !defined(MEDIA_DISABLE_FFMPEG)
// Uses the FFmpeg library for audio file reading.
InMemoryUrlProtocol url_protocol(reinterpret_cast<const uint8*>(data),
data_size, false);
@@ -89,6 +90,9 @@ bool DecodeAudioFileData(
<< " number of channels: " << number_of_channels;
return actual_frames > 0;
+#else
+ return false;
+#endif
xhwang 2015/11/02 18:11:51 #endif // !defined(MEDIA_DISABLE_FFMPEG)
Julien Isorce Samsung 2015/11/03 16:02:27 Acknowledged.
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698