Browse Source

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>
Jeremy Rose 2 years ago
parent
commit
d8e1f4f73b
2 changed files with 7 additions and 6 deletions
  1. 2 0
      patches/config.json
  2. 5 6
      patches/ffmpeg/cherry-pick-e481fc655a62.patch

+ 2 - 0
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",

+ 5 - 6
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 <[email protected]>
-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 <[email protected]>
----
 
 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: