Index: media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h |
diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h |
index 3e30029cd3c19106b72f1fc5b8c52ef46db72379..446fb283fb4f4f267610ff31eda5ffe966abb9f1 100644 |
--- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h |
+++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h |
@@ -10,15 +10,13 @@ |
#include "base/memory/scoped_ptr.h" |
#include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h" |
#include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" |
+#include "media/ffmpeg/ffmpeg_deleters.h" |
struct AVCodecContext; |
struct AVFrame; |
namespace media { |
-class ScopedPtrAVFreeContext; |
-class ScopedPtrAVFreeFrame; |
- |
class FFmpegCdmVideoDecoder : public CdmVideoDecoder { |
public: |
explicit FFmpegCdmVideoDecoder(ClearKeyCdmHost* host); |
@@ -47,8 +45,8 @@ class FFmpegCdmVideoDecoder : public CdmVideoDecoder { |
void ReleaseFFmpegResources(); |
// FFmpeg structures owned by this object. |
- scoped_ptr_malloc<AVCodecContext, ScopedPtrAVFreeContext> codec_context_; |
- scoped_ptr_malloc<AVFrame, ScopedPtrAVFreeFrame> av_frame_; |
+ scoped_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_; |
+ scoped_ptr<AVFrame, ScopedPtrAVFreeFrame> av_frame_; |
bool is_initialized_; |