| Index: webrtc/video_frame.h
|
| diff --git a/webrtc/video_frame.h b/webrtc/video_frame.h
|
| index ff120a6f4c2a1515434023713de598cae5dec3d1..05692788972e4cd07c5b2fb43a1c8a802690f3b5 100644
|
| --- a/webrtc/video_frame.h
|
| +++ b/webrtc/video_frame.h
|
| @@ -44,12 +44,11 @@ class VideoFrame {
|
| int64_t render_time_ms,
|
| VideoRotation rotation);
|
|
|
| - // Creates a shallow copy of |videoFrame|, i.e, the this object will retain a
|
| - // reference to the video buffer also retained by |videoFrame|.
|
| - // TODO(nisse): Deprecated. Should be deleted in the cricket::VideoFrame and
|
| - // webrtc::VideoFrame merge. Instead, pass video_frame_buffer() and timestamps
|
| - // to the constructor.
|
| - void ShallowCopy(const VideoFrame& videoFrame);
|
| + // Support move and copy.
|
| + VideoFrame(const VideoFrame&) = default;
|
| + VideoFrame(VideoFrame&&) = default;
|
| + VideoFrame& operator=(const VideoFrame&) = default;
|
| + VideoFrame& operator=(VideoFrame&&) = default;
|
|
|
| // Get frame width.
|
| int width() const;
|
|
|