| Index: media/filters/ffmpeg_video_decoder.h
 | 
| diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
 | 
| index 30c81346451aba58616f37b9ca41baa8ff78f71d..44d77821ea1651af9bf40b0041c2b1cb69f47eb4 100644
 | 
| --- a/media/filters/ffmpeg_video_decoder.h
 | 
| +++ b/media/filters/ffmpeg_video_decoder.h
 | 
| @@ -13,7 +13,6 @@
 | 
|  #include "base/threading/thread_checker.h"
 | 
|  #include "media/base/video_decoder.h"
 | 
|  #include "media/base/video_decoder_config.h"
 | 
| -#include "media/base/video_frame_pool.h"
 | 
|  #include "media/ffmpeg/ffmpeg_deleters.h"
 | 
|  
 | 
|  struct AVCodecContext;
 | 
| @@ -26,12 +25,16 @@ class SingleThreadTaskRunner;
 | 
|  namespace media {
 | 
|  
 | 
|  class DecoderBuffer;
 | 
| +class GpuMemoryBufferVideoFramePool;
 | 
| +class HybridVideoFramePool;
 | 
|  
 | 
|  class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
 | 
|   public:
 | 
|    static bool IsCodecSupported(VideoCodec codec);
 | 
|  
 | 
|    FFmpegVideoDecoder();
 | 
| +  explicit FFmpegVideoDecoder(
 | 
| +      std::unique_ptr<GpuMemoryBufferVideoFramePool> gpu_video_frame_pool);
 | 
|    ~FFmpegVideoDecoder() override;
 | 
|  
 | 
|    // Allow decoding of individual NALU. Entire frames are required by default.
 | 
| @@ -88,7 +91,7 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
 | 
|  
 | 
|    VideoDecoderConfig config_;
 | 
|  
 | 
| -  VideoFramePool frame_pool_;
 | 
| +  std::unique_ptr<HybridVideoFramePool> hybrid_frame_pool_;
 | 
|  
 | 
|    bool decode_nalus_;
 | 
|  
 | 
| 
 |