Skip to content

Commit

Permalink
chore: add ffmpeg patch dir to config.json (#34597)
Browse files Browse the repository at this point in the history
* chore: add ffmpeg patch dir to config.json

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
  • Loading branch information
nornagon and patchup[bot] committed Jun 17, 2022
1 parent ec40581 commit d8e1f4f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 2 additions & 0 deletions patches/config.json
Expand Up @@ -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",
Expand Down
11 changes: 5 additions & 6 deletions 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 <sandersd@chromium.org>
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 <dalecurtis@chromium.org>
---

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:
Expand Down

0 comments on commit d8e1f4f

Please sign in to comment.