Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1120)

Unified Diff: media/filters/ffmpeg_glue.h

Issue 197793005: Convert scoped_ptr_malloc -> scoped_ptr, part 5. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_demuxer.h ('k') | media/filters/ffmpeg_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « media/filters/ffmpeg_demuxer.h ('k') | media/filters/ffmpeg_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698