| Index: media/filters/ffmpeg_video_decoder.cc
|
| diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
|
| index db70580f66c29ad96275c21975cfa78295da2f25..8f75e1f712e048d63a5bc6e5bfdfef54c355c3af 100644
|
| --- a/media/filters/ffmpeg_video_decoder.cc
|
| +++ b/media/filters/ffmpeg_video_decoder.cc
|
| @@ -156,7 +156,7 @@ void FFmpegVideoDecoder::Initialize(const scoped_refptr<DemuxerStream>& stream,
|
| statistics_cb_ = statistics_cb;
|
|
|
| if (!ConfigureDecoder()) {
|
| - status_cb.Run(PIPELINE_ERROR_DECODE);
|
| + status_cb.Run(DECODER_ERROR_NOT_SUPPORTED);
|
| return;
|
| }
|
|
|
| @@ -502,6 +502,11 @@ bool FFmpegVideoDecoder::ConfigureDecoder() {
|
| return false;
|
| }
|
|
|
| + if (config.is_encrypted() && !decryptor_) {
|
| + DLOG(ERROR) << "Encrypted video stream not supported.";
|
| + return false;
|
| + }
|
| +
|
| // Release existing decoder resources if necessary.
|
| ReleaseFFmpegResources();
|
|
|
|
|