Skip to content

Commit

Permalink
media: ClearKeyCdm: guard FFmpegVideoDecoder with ENABLE_FFMPEG_VIDEO…
Browse files Browse the repository at this point in the history
…_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 <xhwang@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#777009}
  • Loading branch information
Chen-Yu Tsai authored and Commit Bot committed Jun 10, 2020
1 parent bea0c82 commit f83ea5b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -326,7 +326,7 @@ std::unique_ptr<CdmVideoDecoder> 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
Expand Down

0 comments on commit f83ea5b

Please sign in to comment.