| Index: media/ffmpeg/ffmpeg_common.cc
|
| diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
|
| index 772b41dbf6cc77b1c46ada545add2c18d94d4378..fa7e7b46989442bcaca45d869d853539b20eb63c 100644
|
| --- a/media/ffmpeg/ffmpeg_common.cc
|
| +++ b/media/ffmpeg/ffmpeg_common.cc
|
| @@ -12,6 +12,7 @@
|
| #include "base/strings/string_split.h"
|
| #include "base/strings/string_util.h"
|
| #include "media/base/decoder_buffer.h"
|
| +#include "media/base/encryption_scheme.h"
|
| #include "media/base/video_decoder_config.h"
|
| #include "media/base/video_util.h"
|
|
|
| @@ -344,13 +345,8 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context,
|
| extra_data.assign(codec_context->extradata,
|
| codec_context->extradata + codec_context->extradata_size);
|
| }
|
| - config->Initialize(codec,
|
| - sample_format,
|
| - channel_layout,
|
| - sample_rate,
|
| - extra_data,
|
| - is_encrypted,
|
| - seek_preroll,
|
| + config->Initialize(codec, sample_format, channel_layout, sample_rate,
|
| + extra_data, EncryptionScheme(is_encrypted), seek_preroll,
|
| codec_context->delay);
|
|
|
| if (codec != kCodecOpus) {
|
| @@ -498,7 +494,8 @@ bool AVStreamToVideoDecoderConfig(const AVStream* stream,
|
| stream->codec->extradata + stream->codec->extradata_size);
|
| }
|
| config->Initialize(codec, profile, format, color_space, coded_size,
|
| - visible_rect, natural_size, extra_data, is_encrypted);
|
| + visible_rect, natural_size, extra_data,
|
| + EncryptionScheme(is_encrypted));
|
| return true;
|
| }
|
|
|
|
|