| Index: media/filters/ffmpeg_video_decoder.h
|
| diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
|
| index 3c4d39a4a7ee90639c189d2d85be5a4ee4b9d09f..f4937920fe9ce12f79b0b0e6648049ad8a0e5064 100644
|
| --- a/media/filters/ffmpeg_video_decoder.h
|
| +++ b/media/filters/ffmpeg_video_decoder.h
|
| @@ -10,7 +10,6 @@
|
| #include "base/callback.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "media/base/video_decoder.h"
|
| -#include "media/crypto/aes_decryptor.h"
|
|
|
| class MessageLoop;
|
|
|
| @@ -20,6 +19,7 @@ struct AVFrame;
|
| namespace media {
|
|
|
| class DecoderBuffer;
|
| +class Decryptor;
|
|
|
| class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
|
| public:
|
| @@ -36,7 +36,7 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
|
|
|
| // Must be called prior to initialization if decrypted buffers will be
|
| // encountered.
|
| - void set_decryptor(AesDecryptor* decryptor);
|
| + void set_decryptor(Decryptor* decryptor);
|
|
|
| protected:
|
| virtual ~FFmpegVideoDecoder();
|
| @@ -102,7 +102,7 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
|
| // Pointer to the demuxer stream that will feed us compressed buffers.
|
| scoped_refptr<DemuxerStream> demuxer_stream_;
|
|
|
| - AesDecryptor* decryptor_;
|
| + Decryptor* decryptor_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
|
| };
|
|
|