From f83ea5bcb3fbef891c1e9ef01b1f80bd701ad8a1 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Wed, 10 Jun 2020 17:50:59 +0000 Subject: [PATCH] media: ClearKeyCdm: guard FFmpegVideoDecoder with ENABLE_FFMPEG_VIDEO_DECODERS FFmpegVideoDecoder is only available if the ENABLE_FFMPEG_VIDEO_DECODERS buildflag is set, not ENABLE_FFMPEG. Switch to guarding FFmpegVideoDecoder in ClearKeyCdm to be consistent with uses of FFmpegVideoDecoder in other places. R=xhwang@chromium.org Test: build clear_key_cdm Bug: None Change-Id: I2786f3a70282d4e8b3c32ab33e8112649d4a18db Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2231845 Reviewed-by: Xiaohan Wang Commit-Queue: Xiaohan Wang Cr-Commit-Position: refs/heads/master@{#777009} --- media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc b/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc index 35a9c0d8ae6f76..1c63914ceaa837 100644 --- a/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc +++ b/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc @@ -42,7 +42,7 @@ #include "media/filters/dav1d_video_decoder.h" #endif -#if BUILDFLAG(ENABLE_FFMPEG) +#if BUILDFLAG(ENABLE_FFMPEG_VIDEO_DECODERS) #include "media/filters/ffmpeg_video_decoder.h" #endif @@ -326,7 +326,7 @@ std::unique_ptr CreateVideoDecoder( #endif } -#if BUILDFLAG(ENABLE_FFMPEG) +#if BUILDFLAG(ENABLE_FFMPEG_VIDEO_DECODERS) if (!video_decoder) video_decoder.reset(new FFmpegVideoDecoder(null_media_log.get())); #endif