Index: media/filters/ffmpeg_video_decoder.h |
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h |
index 07cf2be2475eca53e6b2add3fdbaa8b4574a1731..fbd38445ab171a5469e25995dc276debe3d5d099 100644 |
--- a/media/filters/ffmpeg_video_decoder.h |
+++ b/media/filters/ffmpeg_video_decoder.h |
@@ -13,6 +13,7 @@ |
#include "media/base/video_decoder.h" |
#include "media/base/video_decoder_config.h" |
#include "media/base/video_frame_pool.h" |
+#include "media/ffmpeg/ffmpeg_deleters.h" |
struct AVCodecContext; |
struct AVFrame; |
@@ -24,8 +25,6 @@ class SingleThreadTaskRunner; |
namespace media { |
class DecoderBuffer; |
-class ScopedPtrAVFreeContext; |
-class ScopedPtrAVFreeFrame; |
class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder { |
public: |
@@ -81,8 +80,8 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder { |
base::Closure reset_cb_; |
// 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_; |
VideoDecoderConfig config_; |