| Index: media/filters/in_memory_url_protocol.h
|
| diff --git a/media/filters/in_memory_url_protocol.h b/media/filters/in_memory_url_protocol.h
|
| index 02d09d4aa1e8321b155198476e5ff2b5fd052a10..f4b8fa45929321cda830e9f818f960b10a272c00 100644
|
| --- a/media/filters/in_memory_url_protocol.h
|
| +++ b/media/filters/in_memory_url_protocol.h
|
| @@ -5,7 +5,6 @@
|
| #ifndef MEDIA_FILTERS_IN_MEMORY_URL_PROTOCOL_H_
|
| #define MEDIA_FILTERS_IN_MEMORY_URL_PROTOCOL_H_
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "media/filters/ffmpeg_glue.h"
|
|
|
| @@ -18,20 +17,20 @@ namespace media {
|
| // this object.
|
| class MEDIA_EXPORT InMemoryUrlProtocol : public FFmpegURLProtocol {
|
| public:
|
| - InMemoryUrlProtocol(const uint8* buf, int64 size, bool streaming);
|
| + InMemoryUrlProtocol(const uint8_t* buf, int64_t size, bool streaming);
|
| virtual ~InMemoryUrlProtocol();
|
|
|
| // FFmpegURLProtocol methods.
|
| - int Read(int size, uint8* data) override;
|
| - bool GetPosition(int64* position_out) override;
|
| - bool SetPosition(int64 position) override;
|
| - bool GetSize(int64* size_out) override;
|
| + int Read(int size, uint8_t* data) override;
|
| + bool GetPosition(int64_t* position_out) override;
|
| + bool SetPosition(int64_t position) override;
|
| + bool GetSize(int64_t* size_out) override;
|
| bool IsStreaming() override;
|
|
|
| private:
|
| - const uint8* data_;
|
| - int64 size_;
|
| - int64 position_;
|
| + const uint8_t* data_;
|
| + int64_t size_;
|
| + int64_t position_;
|
| bool streaming_;
|
|
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(InMemoryUrlProtocol);
|
|
|