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

Unified Diff: chrome/utility/media_galleries/media_metadata_parser.cc

Issue 2346283002: Fix build with media_use_ffmpeg=false (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | content/public/common/feature_h264_with_openh264_ffmpeg.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/utility/media_galleries/media_metadata_parser.cc
diff --git a/chrome/utility/media_galleries/media_metadata_parser.cc b/chrome/utility/media_galleries/media_metadata_parser.cc
index 26d6d42f0862196d0cdb4adfafd1304f2a28d768..7085cb6ae0750258d8e204a1be1589cba3a1e0f1 100644
--- a/chrome/utility/media_galleries/media_metadata_parser.cc
+++ b/chrome/utility/media_galleries/media_metadata_parser.cc
@@ -21,6 +21,7 @@ namespace metadata {
namespace {
+#if !defined(MEDIA_DISABLE_FFMPEG)
void SetStringScopedPtr(const std::string& value,
std::unique_ptr<std::string>* destination) {
DCHECK(destination);
@@ -33,6 +34,7 @@ void SetIntScopedPtr(int value, std::unique_ptr<int>* destination) {
if (value >= 0)
destination->reset(new int(value));
}
+#endif
// This runs on |media_thread_|, as the underlying FFmpeg operation is
// blocking, and the utility thread must not be blocked, so the media file
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | content/public/common/feature_h264_with_openh264_ffmpeg.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698