| Index: media/formats/mp2t/ts_packet.h
|
| diff --git a/media/formats/mp2t/ts_packet.h b/media/formats/mp2t/ts_packet.h
|
| index a232705fbd5596fce613fae13241a1bb3ac920af..294f464d5c987632955dfc36195c547216c1af79 100644
|
| --- a/media/formats/mp2t/ts_packet.h
|
| +++ b/media/formats/mp2t/ts_packet.h
|
| @@ -5,7 +5,9 @@
|
| #ifndef MEDIA_FORMATS_MP2T_TS_PACKET_H_
|
| #define MEDIA_FORMATS_MP2T_TS_PACKET_H_
|
|
|
| -#include "base/basictypes.h"
|
| +#include <stdint.h>
|
| +
|
| +#include "base/macros.h"
|
|
|
| namespace media {
|
|
|
| @@ -19,12 +21,12 @@ class TsPacket {
|
|
|
| // Return the number of bytes to discard
|
| // to be synchronized on a TS syncword.
|
| - static int Sync(const uint8* buf, int size);
|
| + static int Sync(const uint8_t* buf, int size);
|
|
|
| // Parse a TS packet.
|
| // Return a TsPacket only when parsing was successful.
|
| // Return NULL otherwise.
|
| - static TsPacket* Parse(const uint8* buf, int size);
|
| + static TsPacket* Parse(const uint8_t* buf, int size);
|
|
|
| ~TsPacket();
|
|
|
| @@ -38,7 +40,7 @@ class TsPacket {
|
| bool random_access_indicator() const { return random_access_indicator_; }
|
|
|
| // Return the offset and the size of the payload.
|
| - const uint8* payload() const { return payload_; }
|
| + const uint8_t* payload() const { return payload_; }
|
| int payload_size() const { return payload_size_; }
|
|
|
| private:
|
| @@ -46,12 +48,12 @@ class TsPacket {
|
|
|
| // Parse an Mpeg2 TS header.
|
| // The buffer size should be at least |kPacketSize|
|
| - bool ParseHeader(const uint8* buf);
|
| + bool ParseHeader(const uint8_t* buf);
|
| bool ParseAdaptationField(BitReader* bit_reader,
|
| int adaptation_field_length);
|
|
|
| // Size of the payload.
|
| - const uint8* payload_;
|
| + const uint8_t* payload_;
|
| int payload_size_;
|
|
|
| // TS header.
|
|
|