From d8e1f4f73b5f30cd6c5bd3d924de8cc831954a03 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Thu, 16 Jun 2022 17:14:27 -0700 Subject: [PATCH] chore: add ffmpeg patch dir to config.json (#34597) * chore: add ffmpeg patch dir to config.json * chore: update patches Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> --- patches/config.json | 2 ++ patches/ffmpeg/cherry-pick-e481fc655a62.patch | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/patches/config.json b/patches/config.json index dc4168ea35e39..14f337561f2ea 100644 --- a/patches/config.json +++ b/patches/config.json @@ -13,6 +13,8 @@ "src/electron/patches/nan": "src/third_party/nan", + "src/electron/patches/ffmpeg": "src/third_party/ffmpeg", + "src/electron/patches/perfetto": "src/third_party/perfetto", "src/electron/patches/squirrel.mac": "src/third_party/squirrel.mac", diff --git a/patches/ffmpeg/cherry-pick-e481fc655a62.patch b/patches/ffmpeg/cherry-pick-e481fc655a62.patch index d2d69218f3cbb..5f0f904b7f64d 100644 --- a/patches/ffmpeg/cherry-pick-e481fc655a62.patch +++ b/patches/ffmpeg/cherry-pick-e481fc655a62.patch @@ -1,19 +1,18 @@ -From e481fc655a6287e657a88e8c2bcd6f411d254d70 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dan Sanders -Date: Tue, 03 May 2022 14:39:37 -0700 -Subject: [PATCH] Do not parse late SEI messages during decoding. +Date: Tue, 3 May 2022 14:39:37 -0700 +Subject: Do not parse late SEI messages during decoding. Bug: 1306751 Change-Id: I2088b9ff89bd8eee8ab82675258af302d9bfccf9 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/3625832 Reviewed-by: Dale Curtis ---- diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c -index 5ef2550..1e000ca 100644 +index 73b17ba43c3eda5bed4b4abc70d22bbebf0c2eac..a6413bc20db5d08a5c8f1ee4b07edbd4870e168c 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c -@@ -672,6 +672,12 @@ +@@ -678,6 +678,12 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) avpriv_request_sample(avctx, "data partitioning"); break; case H264_NAL_SEI: