diff options
Diffstat (limited to 'www/chromium/files/patch-media_base_video__frame.cc')
| -rw-r--r-- | www/chromium/files/patch-media_base_video__frame.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 20ffe5faa928..59ba49a03366 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2017-02-02 02:02:55 UTC +--- media/base/video_frame.cc.orig 2017-03-09 20:04:34 UTC +++ media/base/video_frame.cc @@ -53,7 +53,7 @@ static std::string StorageTypeToString( return "OWNED_MEMORY"; @@ -18,7 +18,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -323,7 +323,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr +@@ -324,7 +324,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr return frame; } @@ -27,7 +27,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( VideoPixelFormat format, -@@ -435,7 +435,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr +@@ -436,7 +436,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr wrapping_frame->data_[i] = frame->data(i); } @@ -36,7 +36,7 @@ // If there are any |dmabuf_fds_| plugged in, we should duplicate them. if (frame->storage_type() == STORAGE_DMABUFS) { std::vector<int> original_fds; -@@ -720,7 +720,7 @@ size_t VideoFrame::shared_memory_offset( +@@ -722,7 +722,7 @@ size_t VideoFrame::shared_memory_offset( return shared_memory_offset_; } |