| Index: media/filters/ffmpeg_video_decoder.h
|
| diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
|
| index 56402d417ccf82cad640334e7f4300fa5aab9e64..0eb34df037da08124468390e92a5d06e0fcb2407 100644
|
| --- a/media/filters/ffmpeg_video_decoder.h
|
| +++ b/media/filters/ffmpeg_video_decoder.h
|
| @@ -22,7 +22,8 @@ class DecoderBuffer;
|
|
|
| class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
|
| public:
|
| - FFmpegVideoDecoder(const base::Callback<MessageLoop*()>& message_loop_cb);
|
| + FFmpegVideoDecoder(const base::Callback<MessageLoop*()>& message_loop_cb,
|
| + Decryptor* decryptor);
|
|
|
| // VideoDecoder implementation.
|
| virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
|
| @@ -32,10 +33,6 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
|
| virtual void Reset(const base::Closure& closure) OVERRIDE;
|
| virtual void Stop(const base::Closure& closure) OVERRIDE;
|
|
|
| - // Must be called prior to initialization if decrypted buffers will be
|
| - // encountered.
|
| - void set_decryptor(Decryptor* decryptor);
|
| -
|
| // Callback called from within FFmpeg to allocate a buffer based on
|
| // the dimensions of |codec_context|. See AVCodecContext.get_buffer
|
| // documentation inside FFmpeg.
|
|
|