| Index: media/filters/decoder_selector.h
|
| diff --git a/media/filters/decoder_selector.h b/media/filters/decoder_selector.h
|
| index d13eb9be3e11c0ddbb47332313ad9a1873400ebe..44cfe693946a969d0d2f96be0fd1f38f1462924d 100644
|
| --- a/media/filters/decoder_selector.h
|
| +++ b/media/filters/decoder_selector.h
|
| @@ -70,7 +70,8 @@ class MEDIA_EXPORT DecoderSelector {
|
| void SelectDecoder(DemuxerStream* stream,
|
| const SetDecryptorReadyCB& set_decryptor_ready_cb,
|
| const SelectDecoderCB& select_decoder_cb,
|
| - const typename Decoder::OutputCB& output_cb);
|
| + const typename Decoder::OutputCB& output_cb,
|
| + const base::Closure& waiting_for_encryption_key_cb);
|
|
|
| private:
|
| void DecryptingDecoderInitDone(PipelineStatus status);
|
| @@ -86,6 +87,7 @@ class MEDIA_EXPORT DecoderSelector {
|
| SetDecryptorReadyCB set_decryptor_ready_cb_;
|
| SelectDecoderCB select_decoder_cb_;
|
| typename Decoder::OutputCB output_cb_;
|
| + base::Closure waiting_for_encryption_key_cb_;
|
|
|
| scoped_ptr<Decoder> decoder_;
|
| scoped_ptr<DecryptingDemuxerStream> decrypted_stream_;
|
|
|