<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f4cd44b714ac1fc80760c8aaceac4b5c53915739">https://github.com/macports/macports-ports/commit/f4cd44b714ac1fc80760c8aaceac4b5c53915739</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f4cd44b714ac1fc80760c8aaceac4b5c53915739
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Jun 26 13:03:58 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg/ffmpeg-devel: reconcile with ffmpeg-upstream
</span>---
multimedia/ffmpeg-devel/Portfile | 8 +++++---
multimedia/ffmpeg/Portfile | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/Portfile b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 693327b481b..e271d1016d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,14 +15,16 @@ PortGroup xcode_workaround 1.0
</span>
name ffmpeg-devel
set my_name ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts ffmpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts ffmpeg ffmpeg-upstream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Please increase the revision of mpv whenever ffmpeg's version is updated.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 0
</span> version 5.0.1
revision 1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> license LGPL-2.1+
categories multimedia
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {devans @dbevans} {jeremyhu @jeremyhu} {mascguy @mascguy} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mascguy @mascguy} openmaintainer
</span>
description FFmpeg is a complete solution to play, record, convert and \
stream audio and video.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/Portfile b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 454501d56a5..af4981c6e30 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,14 +15,16 @@ PortGroup xcode_workaround 1.0
</span>
name ffmpeg
set my_name ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts ffmpeg-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts ffmpeg-devel ffmpeg-upstream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Please increase the revision of mpv whenever ffmpeg's version is updated.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 1
</span> version 4.4.1
revision 6
<span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> license LGPL-2.1+
categories multimedia
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {devans @dbevans} {jeremyhu @jeremyhu} {mascguy @mascguy} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mascguy @mascguy} {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
</span>
description FFmpeg is a complete solution to play, record, convert and \
stream audio and video.
</pre><pre style='margin:0'>
</pre>