diff --git a/src/icons/.fontcustom-manifest.json b/src/icons/.fontcustom-manifest.json
index fb43a0e64..459076b2e 100644
--- a/src/icons/.fontcustom-manifest.json
+++ b/src/icons/.fontcustom-manifest.json
@@ -1,7 +1,7 @@
 {
   "checksum": {
-    "previous": "9d20b64ede505c7e22d1b337079af516ba6e5a3876388182ebbe4cf4b549a1a4",
-    "current": "9d20b64ede505c7e22d1b337079af516ba6e5a3876388182ebbe4cf4b549a1a4"
+    "previous": "5ba8f7738f5ba72f24cefb1362ac0a1ac22cccd5d7054192255cd1d3c3e32d5c",
+    "current": "5ba8f7738f5ba72f24cefb1362ac0a1ac22cccd5d7054192255cd1d3c3e32d5c"
   },
   "fonts": [
     "forkawesome/forkawesome.ttf",
@@ -947,6 +947,10 @@
       "codepoint": 61826,
       "source": "svg/female.svg"
     },
+    "ffmpeg": {
+      "codepoint": 62223,
+      "source": "svg/ffmpeg.svg"
+    },
     "fighter-jet": {
       "codepoint": 61691,
       "source": "svg/fighter-jet.svg"
diff --git a/src/icons/icons.yml b/src/icons/icons.yml
index aad1e87c3..f337df894 100644
--- a/src/icons/icons.yml
+++ b/src/icons/icons.yml
@@ -6977,7 +6977,6 @@ icons:
     categories:
       - Brand Icons
 
-<<<<<<< HEAD
   - name:       Hackaday
     id:         hackaday
     unicode:    f30a
@@ -7018,3 +7017,11 @@ icons:
     url:        php.net
     categories:
       - Brand Icons
+
+  - name:       FFmpeg
+    id:         ffmpeg
+    unicode:    f30f
+    created:    1.0
+    url:        ffmpeg.org
+    categories:
+      - Brand Icons
diff --git a/src/icons/svg/ffmpeg.svg b/src/icons/svg/ffmpeg.svg
new file mode 100644
index 000000000..2a1621bae
--- /dev/null
+++ b/src/icons/svg/ffmpeg.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1536" height="1792">
+    <path d="M1157.502 1212.925v-179.221l-529.947 527.003L0 1507.575 1010.292 408.332l-167.62 9.9-729.58 809.417V539.93l68.643-82.63-168.763 9.976V282.32l591.406-50.06-325.036 379.08v160.412l482.781-552.845L1536 153.41 401.6 1346.681l149.622 8.632 823.86-849.044v805.939l-92.149 86.59 234.08 13.835V1636l-730.747-61.89z"/>
+</svg>