| Index: media/gpu/android_video_encode_accelerator.h
|
| diff --git a/media/gpu/android_video_encode_accelerator.h b/media/gpu/android_video_encode_accelerator.h
|
| index 071a1611723f62f1245eecc9135da8163cfa7868..28b787bd5a9d6ecd1cf8268d4469a1d83e839626 100644
|
| --- a/media/gpu/android_video_encode_accelerator.h
|
| +++ b/media/gpu/android_video_encode_accelerator.h
|
| @@ -11,13 +11,13 @@
|
| #include <list>
|
| #include <memory>
|
| #include <queue>
|
| +#include <tuple>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "base/timer/timer.h"
|
| -#include "base/tuple.h"
|
| #include "media/base/android/sdk_media_codec_bridge.h"
|
| #include "media/gpu/media_gpu_export.h"
|
| #include "media/video/video_encode_accelerator.h"
|
| @@ -87,7 +87,7 @@ class MEDIA_GPU_EXPORT AndroidVideoEncodeAccelerator
|
| // Frames waiting to be passed to the codec, queued until an input buffer is
|
| // available. Each element is a tuple of <Frame, key_frame, enqueue_time>.
|
| typedef std::queue<
|
| - base::Tuple<scoped_refptr<media::VideoFrame>, bool, base::Time>>
|
| + std::tuple<scoped_refptr<media::VideoFrame>, bool, base::Time>>
|
| PendingFrames;
|
| PendingFrames pending_frames_;
|
|
|
|
|