| Index: media/formats/mpeg/mpeg1_audio_stream_parser.h
|
| diff --git a/media/formats/mpeg/mpeg1_audio_stream_parser.h b/media/formats/mpeg/mpeg1_audio_stream_parser.h
|
| index 3b299a105bd07b952abd7d2d94d8f6d18293b8d1..de9b138711daf27e520a37f886f6db7c52312704 100644
|
| --- a/media/formats/mpeg/mpeg1_audio_stream_parser.h
|
| +++ b/media/formats/mpeg/mpeg1_audio_stream_parser.h
|
| @@ -5,7 +5,6 @@
|
| #ifndef MEDIA_FORMATS_MPEG_MPEG1_AUDIO_STREAM_PARSER_H_
|
| #define MEDIA_FORMATS_MPEG_MPEG1_AUDIO_STREAM_PARSER_H_
|
|
|
| -#include "base/basictypes.h"
|
| #include "media/base/media_export.h"
|
| #include "media/formats/mpeg/mpeg_audio_stream_parser_base.h"
|
|
|
| @@ -63,7 +62,7 @@ class MEDIA_EXPORT MPEG1AudioStreamParser : public MPEGAudioStreamParserBase {
|
| // Assumption: size of array |data| should be at least |kHeaderSize|.
|
| // Returns false if the header is not valid.
|
| static bool ParseHeader(const scoped_refptr<MediaLog>& media_log,
|
| - const uint8* data,
|
| + const uint8_t* data,
|
| Header* header);
|
|
|
| MPEG1AudioStreamParser();
|
| @@ -71,7 +70,7 @@ class MEDIA_EXPORT MPEG1AudioStreamParser : public MPEGAudioStreamParserBase {
|
|
|
| private:
|
| // MPEGAudioStreamParserBase overrides.
|
| - int ParseFrameHeader(const uint8* data,
|
| + int ParseFrameHeader(const uint8_t* data,
|
| int size,
|
| int* frame_size,
|
| int* sample_rate,
|
|
|