Index: trunk/src/media/filters/ffmpeg_video_decoder.h |
=================================================================== |
--- trunk/src/media/filters/ffmpeg_video_decoder.h (revision 195011) |
+++ trunk/src/media/filters/ffmpeg_video_decoder.h (working copy) |
@@ -8,7 +8,7 @@ |
#include <list> |
#include "base/callback.h" |
-#include "base/memory/weak_ptr.h" |
+#include "base/memory/ref_counted.h" |
#include "media/base/demuxer_stream.h" |
#include "media/base/video_decoder.h" |
@@ -27,7 +27,6 @@ |
public: |
explicit FFmpegVideoDecoder( |
const scoped_refptr<base::MessageLoopProxy>& message_loop); |
- virtual ~FFmpegVideoDecoder(); |
// VideoDecoder implementation. |
virtual void Initialize(const scoped_refptr<DemuxerStream>& stream, |
@@ -42,6 +41,9 @@ |
// documentation inside FFmpeg. |
int GetVideoBuffer(AVCodecContext *codec_context, AVFrame* frame); |
+ protected: |
+ virtual ~FFmpegVideoDecoder(); |
+ |
private: |
enum DecoderState { |
kUninitialized, |
@@ -72,8 +74,6 @@ |
void DoReset(); |
scoped_refptr<base::MessageLoopProxy> message_loop_; |
- base::WeakPtrFactory<FFmpegVideoDecoder> weak_factory_; |
- base::WeakPtr<FFmpegVideoDecoder> weak_this_; |
DecoderState state_; |