summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--media/filters/decoder_base.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/media/filters/decoder_base.h b/media/filters/decoder_base.h
index 8796464..9e806b3 100644
--- a/media/filters/decoder_base.h
+++ b/media/filters/decoder_base.h
@@ -27,7 +27,6 @@ namespace media {
template <class Decoder, class Output>
class DecoderBase : public Decoder {
public:
- typedef CallbackRunner< Tuple1<Output*> > ReadCallback;
// MediaFilter implementation.
virtual void Stop(FilterCallback* callback) {
@@ -188,7 +187,10 @@ class DecoderBase : public Decoder {
expecting_discontinuous_ = true;
// Signal that we're done seeking.
- callback->Run();
+ if (callback) {
+ callback->Run();
+ delete callback;
+ }
}
void InitializeTask(DemuxerStream* demuxer_stream, FilterCallback* callback) {
@@ -302,9 +304,6 @@ class DecoderBase : public Decoder {
typedef std::deque<scoped_refptr<Output> > ResultQueue;
ResultQueue result_queue_;
- // Pause callback.
- scoped_ptr<FilterCallback> pause_callback_;
-
// Simple state tracking variable.
enum State {
kUninitialized,