Index: media/filters/ffmpeg_glue.h |
diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h |
index 17241b9730a7ee136488bf4604dd8c9f8d34742e..0073ac3c8237a36bdbafb9df31426fb201baac86 100644 |
--- a/media/filters/ffmpeg_glue.h |
+++ b/media/filters/ffmpeg_glue.h |
@@ -28,14 +28,13 @@ |
#include "base/basictypes.h" |
#include "base/memory/scoped_ptr.h" |
#include "media/base/media_export.h" |
+#include "media/ffmpeg/ffmpeg_deleters.h" |
struct AVFormatContext; |
struct AVIOContext; |
namespace media { |
-class ScopedPtrAVFree; |
- |
class MEDIA_EXPORT FFmpegURLProtocol { |
public: |
// Read the given amount of bytes into data, returns the number of bytes read |
@@ -73,7 +72,7 @@ class MEDIA_EXPORT FFmpegGlue { |
private: |
bool open_called_; |
AVFormatContext* format_context_; |
- scoped_ptr_malloc<AVIOContext, ScopedPtrAVFree> avio_context_; |
+ scoped_ptr<AVIOContext, ScopedPtrAVFree> avio_context_; |
DISALLOW_COPY_AND_ASSIGN(FFmpegGlue); |
}; |