| Index: content/renderer/pepper/video_decoder_shim.h
|
| diff --git a/content/renderer/pepper/video_decoder_shim.h b/content/renderer/pepper/video_decoder_shim.h
|
| index 566a0de74c338958ee39c91b6c20c88528acce84..0eac81eeb648c20fe03221d6d69056b8d74abccf 100644
|
| --- a/content/renderer/pepper/video_decoder_shim.h
|
| +++ b/content/renderer/pepper/video_decoder_shim.h
|
| @@ -5,11 +5,13 @@
|
| #ifndef CONTENT_RENDERER_PEPPER_VIDEO_DECODER_SHIM_H_
|
| #define CONTENT_RENDERER_PEPPER_VIDEO_DECODER_SHIM_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <queue>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/containers/hash_tables.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "gpu/command_buffer/common/mailbox.h"
|
| @@ -54,7 +56,7 @@ class VideoDecoderShim : public media::VideoDecodeAccelerator {
|
| void Decode(const media::BitstreamBuffer& bitstream_buffer) override;
|
| void AssignPictureBuffers(
|
| const std::vector<media::PictureBuffer>& buffers) override;
|
| - void ReusePictureBuffer(int32 picture_buffer_id) override;
|
| + void ReusePictureBuffer(int32_t picture_buffer_id) override;
|
| void Flush() override;
|
| void Reset() override;
|
| void Destroy() override;
|
|
|