From 257fce15e8b4dfa112d039e7888e3ec04e523198 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 13 May 2019 16:08:33 +0100 Subject: swaroop: basics of encrypted MP4 playback. --- src/lib/ffmpeg_decoder.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/lib/ffmpeg_decoder.cc') diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 0e65a6d6b..c52723da3 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -59,7 +59,6 @@ extern "C" { #include "i18n.h" - using std::cout; using std::string; using std::vector; @@ -159,6 +158,12 @@ FFmpegDecoder::flush () bool FFmpegDecoder::pass () { +#ifdef DCPOMATIC_VARIANT_SWAROOP + if (_ffmpeg_content->encrypted() && !_ffmpeg_content->kdm()) { + return true; + } +#endif + int r = av_read_frame (_format_context, &_packet); /* AVERROR_INVALIDDATA can apparently be returned sometimes even when av_read_frame -- cgit v1.2.3