| Index: media/formats/mp2t/mp2t_stream_parser.h
|
| diff --git a/media/formats/mp2t/mp2t_stream_parser.h b/media/formats/mp2t/mp2t_stream_parser.h
|
| index 3efe2a78c786956a8a853342eedf2fcf896450fe..e7d598ae259e2873c6ab5fabdfbff16aa2d1c59d 100644
|
| --- a/media/formats/mp2t/mp2t_stream_parser.h
|
| +++ b/media/formats/mp2t/mp2t_stream_parser.h
|
| @@ -31,14 +31,15 @@ class MEDIA_EXPORT Mp2tStreamParser : public StreamParser {
|
| virtual ~Mp2tStreamParser();
|
|
|
| // StreamParser implementation.
|
| - virtual void Init(const InitCB& init_cb,
|
| - const NewConfigCB& config_cb,
|
| - const NewBuffersCB& new_buffers_cb,
|
| - bool ignore_text_tracks,
|
| - const NeedKeyCB& need_key_cb,
|
| - const NewMediaSegmentCB& new_segment_cb,
|
| - const base::Closure& end_of_segment_cb,
|
| - const LogCB& log_cb) override;
|
| + virtual void Init(
|
| + const InitCB& init_cb,
|
| + const NewConfigCB& config_cb,
|
| + const NewBuffersCB& new_buffers_cb,
|
| + bool ignore_text_tracks,
|
| + const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
|
| + const NewMediaSegmentCB& new_segment_cb,
|
| + const base::Closure& end_of_segment_cb,
|
| + const LogCB& log_cb) override;
|
| virtual void Flush() override;
|
| virtual bool Parse(const uint8* buf, int size) override;
|
|
|
| @@ -97,7 +98,7 @@ class MEDIA_EXPORT Mp2tStreamParser : public StreamParser {
|
| InitCB init_cb_;
|
| NewConfigCB config_cb_;
|
| NewBuffersCB new_buffers_cb_;
|
| - NeedKeyCB need_key_cb_;
|
| + EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
|
| NewMediaSegmentCB new_segment_cb_;
|
| base::Closure end_of_segment_cb_;
|
| LogCB log_cb_;
|
|
|