| Index: media/base/android/ndk_media_codec_bridge.h
|
| diff --git a/media/base/android/ndk_media_codec_bridge.h b/media/base/android/ndk_media_codec_bridge.h
|
| index 75bada9265afe32fccaf4815f5c2d644dd1d388a..d16d6f8eb40b56482a473f609ea0ef9eb1ccb6cf 100644
|
| --- a/media/base/android/ndk_media_codec_bridge.h
|
| +++ b/media/base/android/ndk_media_codec_bridge.h
|
| @@ -6,6 +6,7 @@
|
| #define MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_
|
|
|
| #include <media/NdkMediaCodec.h>
|
| +#include <stdint.h>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -27,13 +28,13 @@ class MEDIA_EXPORT NdkMediaCodecBridge : public MediaCodecBridge {
|
| int GetOutputSamplingRate() override;
|
| MediaCodecStatus QueueInputBuffer(
|
| int index,
|
| - const uint8* data,
|
| + const uint8_t* data,
|
| size_t data_size,
|
| const base::TimeDelta& presentation_time) override;
|
| using MediaCodecBridge::QueueSecureInputBuffer;
|
| MediaCodecStatus QueueSecureInputBuffer(
|
| int index,
|
| - const uint8* data,
|
| + const uint8_t* data,
|
| size_t data_size,
|
| const std::vector<char>& key_id,
|
| const std::vector<char>& iv,
|
| @@ -52,7 +53,7 @@ class MEDIA_EXPORT NdkMediaCodecBridge : public MediaCodecBridge {
|
| bool* key_frame) override;
|
| void ReleaseOutputBuffer(int index, bool render) override;
|
| void GetInputBuffer(int input_buffer_index,
|
| - uint8** data,
|
| + uint8_t** data,
|
| size_t* capacity) override;
|
| bool CopyFromOutputBuffer(int index,
|
| size_t offset,
|
|
|