summaryrefslogtreecommitdiff
path: root/chromium/third_party/ffmpeg/README.chromium
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 10:22:43 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 12:36:28 +0000
commit271a6c3487a14599023a9106329505597638d793 (patch)
treee040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/third_party/ffmpeg/README.chromium
parent7b2ffa587235a47d4094787d72f38102089f402a (diff)
downloadqtwebengine-chromium-271a6c3487a14599023a9106329505597638d793.tar.gz
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/ffmpeg/README.chromium')
-rw-r--r--chromium/third_party/ffmpeg/README.chromium2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/third_party/ffmpeg/README.chromium b/chromium/third_party/ffmpeg/README.chromium
index c7737142b65..80582b72bdc 100644
--- a/chromium/third_party/ffmpeg/README.chromium
+++ b/chromium/third_party/ffmpeg/README.chromium
@@ -3,7 +3,7 @@ URL: http://ffmpeg.org/
License: LGPL 2.1
License File: CREDITS.chromium
Upstream Git: git://source.ffmpeg.org/ffmpeg.git
-Last Upstream Merge: a899b3b3c5f55e6c527f8aa81dbe15edb9fab63f, Feb 21 2019
+Last Upstream Merge: 81d3d7dd44acc7ae7c57e99176d1d428fb40c353, Jul 12 2019
This file documents the layout of the Chromium copy of FFmpeg, some common
tasks, and how to create the build files and related configurations.