| Index: webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
|
| diff --git a/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h b/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
|
| index e464ffbcddf457d9ac9d653d0450bd5480a1e0b5..962305496cc78f13ae7ed7fcf1a39a355a576be4 100644
|
| --- a/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
|
| +++ b/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
|
| @@ -12,13 +12,14 @@
|
| #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_DECODER_IMPL_H_
|
| #define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_DECODER_IMPL_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
|
|
|
| extern "C" {
|
| #include "third_party/ffmpeg/libavcodec/avcodec.h"
|
| } // extern "C"
|
|
|
| -#include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/common_video/include/i420_buffer_pool.h"
|
|
|
| namespace webrtc {
|
| @@ -63,8 +64,8 @@ class H264DecoderImpl : public H264Decoder {
|
| bool IsInitialized() const;
|
|
|
| I420BufferPool pool_;
|
| - rtc::scoped_ptr<AVCodecContext, AVCodecContextDeleter> av_context_;
|
| - rtc::scoped_ptr<AVFrame, AVFrameDeleter> av_frame_;
|
| + std::unique_ptr<AVCodecContext, AVCodecContextDeleter> av_context_;
|
| + std::unique_ptr<AVFrame, AVFrameDeleter> av_frame_;
|
|
|
| DecodedImageCallback* decoded_image_callback_;
|
| };
|
|
|