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

Side by Side Diff: content/public/common/feature_h264_with_openh264_ffmpeg.h

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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_PUBLIC_COMMON_FEATURE_H264_WITH_OPENH264_FFMPEG_H_ 5 #ifndef CONTENT_PUBLIC_COMMON_FEATURE_H264_WITH_OPENH264_FFMPEG_H_
6 #define CONTENT_PUBLIC_COMMON_FEATURE_H264_WITH_OPENH264_FFMPEG_H_ 6 #define CONTENT_PUBLIC_COMMON_FEATURE_H264_WITH_OPENH264_FFMPEG_H_
7 7
8 #include "base/feature_list.h" 8 #include "base/feature_list.h"
9 #include "content/public/common/features.h" 9 #include "content/public/common/features.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 #if BUILDFLAG(RTC_USE_H264) 13 #if BUILDFLAG(RTC_USE_H264) && !defined(MEDIA_DISABLE_FFMPEG)
14 14
15 // Run-time feature for the |rtc_use_h264| encoder/decoder. 15 // Run-time feature for the |rtc_use_h264| encoder/decoder.
16 extern const base::Feature kWebRtcH264WithOpenH264FFmpeg; 16 extern const base::Feature kWebRtcH264WithOpenH264FFmpeg;
17 17
18 #endif // BUILDFLAG(RTC_USE_H264) 18 #endif // BUILDFLAG(RTC_USE_H264) && !defined(MEDIA_DISABLE_FFMPEG)
19 19
20 } // namespace content 20 } // namespace content
21 21
22 #endif // CONTENT_PUBLIC_COMMON_FEATURE_H264_WITH_OPENH264_FFMPEG_H_ 22 #endif // CONTENT_PUBLIC_COMMON_FEATURE_H264_WITH_OPENH264_FFMPEG_H_
OLDNEW
« no previous file with comments | « chrome/utility/media_galleries/media_metadata_parser.cc ('k') | content/public/common/feature_h264_with_openh264_ffmpeg.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698