| Index: media/filters/ffmpeg_video_decoder.cc
|
| diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
|
| index ca26e8eb3730403068abc3129ad45e00e31ebe2d..d5d1a6bc0c9b499acc013d0fa87be09d097f07de 100644
|
| --- a/media/filters/ffmpeg_video_decoder.cc
|
| +++ b/media/filters/ffmpeg_video_decoder.cc
|
| @@ -54,13 +54,14 @@ static int GetThreadCount(CodecID codec_id) {
|
| }
|
|
|
| FFmpegVideoDecoder::FFmpegVideoDecoder(
|
| - const base::Callback<MessageLoop*()>& message_loop_cb)
|
| + const base::Callback<MessageLoop*()>& message_loop_cb,
|
| + Decryptor* decryptor)
|
| : message_loop_factory_cb_(message_loop_cb),
|
| message_loop_(NULL),
|
| state_(kUninitialized),
|
| codec_context_(NULL),
|
| av_frame_(NULL),
|
| - decryptor_(NULL) {
|
| + decryptor_(decryptor) {
|
| }
|
|
|
| int FFmpegVideoDecoder::GetVideoBuffer(AVCodecContext* codec_context,
|
| @@ -253,11 +254,6 @@ void FFmpegVideoDecoder::DoStop() {
|
| base::ResetAndReturn(&stop_cb_).Run();
|
| }
|
|
|
| -void FFmpegVideoDecoder::set_decryptor(Decryptor* decryptor) {
|
| - DCHECK_EQ(state_, kUninitialized);
|
| - decryptor_ = decryptor;
|
| -}
|
| -
|
| FFmpegVideoDecoder::~FFmpegVideoDecoder() {
|
| ReleaseFFmpegResources();
|
| }
|
|
|