diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2020-06-02 20:30:55 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2020-06-02 20:30:55 +0000 |
| commit | 8f6dc7d1dd8b0ca59427d71524538aab9403ac23 (patch) | |
| tree | c272eeb9d12c3f96a460e7ad3fd1eb4233ad20ce /www/chromium/files/patch-media_base_video__frame.h | |
| parent | multimedia/libva-intel-driver: update to 2.4.1 (diff) | |
www/chromium: Update to version 83.0.4103.61
Submitted by: Matthias Wolf <freebsd@rheinwolf.de>
Reviewed by: rene
Approved by: chromium@ (rene)
Obtained from: https://github.com/gliaskos/freebsd-chromium
MFH: 2020Q2
Security: https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop.html
Differential Revision: https://reviews.freebsd.org/D25102
Diffstat (limited to 'www/chromium/files/patch-media_base_video__frame.h')
| -rw-r--r-- | www/chromium/files/patch-media_base_video__frame.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index d37ffac67837..dc6f83903ec6 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2020-03-16 18:40:33 UTC +--- media/base/video_frame.h.orig 2020-05-13 18:40:32 UTC +++ media/base/video_frame.h @@ -39,9 +39,9 @@ #include "base/mac/scoped_cftyperef.h" @@ -21,7 +21,7 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -244,7 +244,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxCB mailbox_holder_release_cb, base::TimeDelta timestamp); @@ -30,7 +30,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -480,7 +480,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -476,7 +476,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // mailbox, the caller must wait for the included sync point. const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; @@ -39,7 +39,7 @@ // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -662,7 +662,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -654,7 +654,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_; |