| Index: media/formats/mp2t/es_parser.cc
|
| diff --git a/media/formats/mp2t/es_parser.cc b/media/formats/mp2t/es_parser.cc
|
| index cdd6e071f49974e9759b212026f96907e859de0d..7512c0b88ecf8fbcf5798e253a4fceb6ed71e888 100644
|
| --- a/media/formats/mp2t/es_parser.cc
|
| +++ b/media/formats/mp2t/es_parser.cc
|
| @@ -28,7 +28,8 @@ EsParser::EsParser()
|
| EsParser::~EsParser() {
|
| }
|
|
|
| -bool EsParser::Parse(const uint8* buf, int size,
|
| +bool EsParser::Parse(const uint8_t* buf,
|
| + int size,
|
| base::TimeDelta pts,
|
| DecodeTimestamp dts) {
|
| DCHECK(buf);
|
| @@ -38,7 +39,7 @@ bool EsParser::Parse(const uint8* buf, int size,
|
| // Link the end of the byte queue with the incoming timing descriptor.
|
| TimingDesc timing_desc(dts, pts);
|
| timing_desc_list_.push_back(
|
| - std::pair<int64, TimingDesc>(es_queue_->tail(), timing_desc));
|
| + std::pair<int64_t, TimingDesc>(es_queue_->tail(), timing_desc));
|
| }
|
|
|
| // Add the incoming bytes to the ES queue.
|
| @@ -52,7 +53,7 @@ void EsParser::Reset() {
|
| ResetInternal();
|
| }
|
|
|
| -EsParser::TimingDesc EsParser::GetTimingDescriptor(int64 es_byte_count) {
|
| +EsParser::TimingDesc EsParser::GetTimingDescriptor(int64_t es_byte_count) {
|
| TimingDesc timing_desc;
|
| while (!timing_desc_list_.empty() &&
|
| timing_desc_list_.front().first <= es_byte_count) {
|
|
|