| Index: media/filters/decoder_selector.h
|
| diff --git a/media/filters/decoder_selector.h b/media/filters/decoder_selector.h
|
| index 662e8082ea297ad25faf11708a2cfc306af468a8..c50f9fba718f3fbff909271f0200b39442f26108 100644
|
| --- a/media/filters/decoder_selector.h
|
| +++ b/media/filters/decoder_selector.h
|
| @@ -57,6 +57,9 @@ class MEDIA_EXPORT DecoderSelector {
|
| const scoped_refptr<base::SingleThreadTaskRunner>& message_loop,
|
| ScopedVector<Decoder> decoders,
|
| const SetDecryptorReadyCB& set_decryptor_ready_cb);
|
| +
|
| + // Aborts pending Decoder selection and fires |select_decoder_cb| with
|
| + // NULL and NULL immediately if it's pending.
|
| ~DecoderSelector();
|
|
|
| // Initializes and selects a Decoder that can decode the |stream|.
|
| @@ -67,10 +70,6 @@ class MEDIA_EXPORT DecoderSelector {
|
| const SelectDecoderCB& select_decoder_cb,
|
| const typename Decoder::OutputCB& output_cb);
|
|
|
| - // Aborts pending Decoder selection and fires |select_decoder_cb| with
|
| - // NULL and NULL immediately if it's pending.
|
| - void Abort();
|
| -
|
| private:
|
| void DecryptingDecoderInitDone(PipelineStatus status);
|
| void DecryptingDemuxerStreamInitDone(PipelineStatus status);
|
|
|