From f8b5b7801677c60638a7dd9ab98a6c06a7d32662 Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Tue, 5 Nov 2024 16:35:48 +0100 Subject: [PATCH] Add support for ffmpeg 7 --- src/version.js | 2 +- src/views/Edit/Sources/ALSA.js | 2 +- src/views/Edit/Sources/AVFoundation.js | 2 +- src/views/Edit/Sources/AudioLoop.js | 2 +- src/views/Edit/Sources/Framebuffer.js | 2 +- src/views/Edit/Sources/Network.js | 2 +- src/views/Edit/Sources/NoAudio.js | 2 +- src/views/Edit/Sources/Raspicam.js | 2 +- src/views/Edit/Sources/SDP.js | 2 +- src/views/Edit/Sources/V4L.js | 2 +- src/views/Edit/Sources/VideoAudio.js | 2 +- src/views/Edit/Sources/VideoLoop.js | 2 +- src/views/Edit/Sources/VirtualAudio.js | 2 +- src/views/Edit/Sources/VirtualVideo.js | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/version.js b/src/version.js index b7c73df..9e95f2e 100644 --- a/src/version.js +++ b/src/version.js @@ -1,7 +1,7 @@ import pkg from '../package.json'; const Core = '^16.11.0'; -const FFmpeg = '^5.1.0 || ^6.1.0'; +const FFmpeg = '^5.1.0 || ^6.1.0 || ^7.0.0'; const UI = pkg.bundle ? pkg.bundle : pkg.name + ' v' + pkg.version; const Version = pkg.version; diff --git a/src/views/Edit/Sources/ALSA.js b/src/views/Edit/Sources/ALSA.js index a2e9fd4..c57a5b1 100644 --- a/src/views/Edit/Sources/ALSA.js +++ b/src/views/Edit/Sources/ALSA.js @@ -156,7 +156,7 @@ function SourceIcon(props) { const id = 'alsa'; const name = ALSA; const capabilities = ['audio']; -const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0'; +const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0 || ^7.0.0'; const func = { initSettings, diff --git a/src/views/Edit/Sources/AVFoundation.js b/src/views/Edit/Sources/AVFoundation.js index 1cde83b..45e739f 100644 --- a/src/views/Edit/Sources/AVFoundation.js +++ b/src/views/Edit/Sources/AVFoundation.js @@ -221,7 +221,7 @@ function SourceIcon(props) { const id = 'avfoundation'; const name = AVFoundation; const capabilities = ['audio', 'video']; -const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0'; +const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0 || ^7.0.0'; const func = { initSettings, diff --git a/src/views/Edit/Sources/AudioLoop.js b/src/views/Edit/Sources/AudioLoop.js index c88deca..4e78616 100644 --- a/src/views/Edit/Sources/AudioLoop.js +++ b/src/views/Edit/Sources/AudioLoop.js @@ -192,7 +192,7 @@ function SourceIcon(props) { const id = 'audioloop'; const name = Loop; const capabilities = ['audio']; -const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0'; +const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0 || ^7.0.0'; const func = { initSettings, diff --git a/src/views/Edit/Sources/Framebuffer.js b/src/views/Edit/Sources/Framebuffer.js index 8692429..5d31f14 100644 --- a/src/views/Edit/Sources/Framebuffer.js +++ b/src/views/Edit/Sources/Framebuffer.js @@ -130,7 +130,7 @@ function SourceIcon(props) { const id = 'fbdev'; const name = Framebuffer; const capabilities = ['video']; -const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0'; +const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0 || ^7.0.0'; const func = { initSettings, diff --git a/src/views/Edit/Sources/Network.js b/src/views/Edit/Sources/Network.js index 6d9188e..d52758d 100644 --- a/src/views/Edit/Sources/Network.js +++ b/src/views/Edit/Sources/Network.js @@ -1229,7 +1229,7 @@ function SourceIcon(props) { const id = 'network'; const name = Network source; const capabilities = ['audio', 'video']; -const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0'; +const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0 || ^7.0.0'; const func = { initSettings, diff --git a/src/views/Edit/Sources/NoAudio.js b/src/views/Edit/Sources/NoAudio.js index 51f7ec1..8e46997 100644 --- a/src/views/Edit/Sources/NoAudio.js +++ b/src/views/Edit/Sources/NoAudio.js @@ -37,7 +37,7 @@ function SourceIcon(props) { const id = 'noaudio'; const name = No audio; const capabilities = ['audio']; -const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0'; +const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0 || ^7.0.0'; const func = { initSettings, diff --git a/src/views/Edit/Sources/Raspicam.js b/src/views/Edit/Sources/Raspicam.js index a35fc04..0d48ede 100644 --- a/src/views/Edit/Sources/Raspicam.js +++ b/src/views/Edit/Sources/Raspicam.js @@ -136,7 +136,7 @@ function SourceIcon(props) { const id = 'raspicam'; const name = Raspberry Pi camera; const capabilities = ['video']; -const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0'; +const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0 || ^7.0.0'; const func = { initSettings, diff --git a/src/views/Edit/Sources/SDP.js b/src/views/Edit/Sources/SDP.js index d9b93d1..32e85d3 100644 --- a/src/views/Edit/Sources/SDP.js +++ b/src/views/Edit/Sources/SDP.js @@ -193,7 +193,7 @@ function SourceIcon(props) { const id = 'sdp'; const name = SDP; const capabilities = ['video', 'audio']; -const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0'; +const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0 || ^7.0.0'; const func = { initSettings, diff --git a/src/views/Edit/Sources/V4L.js b/src/views/Edit/Sources/V4L.js index 8f9b044..1a00678 100644 --- a/src/views/Edit/Sources/V4L.js +++ b/src/views/Edit/Sources/V4L.js @@ -145,7 +145,7 @@ function SourceIcon(props) { const id = 'video4linux2'; const name = Hardware device; const capabilities = ['video']; -const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0'; +const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0 || ^7.0.0'; const func = { initSettings, diff --git a/src/views/Edit/Sources/VideoAudio.js b/src/views/Edit/Sources/VideoAudio.js index 084d57d..d49adeb 100644 --- a/src/views/Edit/Sources/VideoAudio.js +++ b/src/views/Edit/Sources/VideoAudio.js @@ -37,7 +37,7 @@ function SourceIcon(props) { const id = 'videoaudio'; const name = Video source; const capabilities = ['audio']; -const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0'; +const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0 || ^7.0.0'; const func = { initSettings, diff --git a/src/views/Edit/Sources/VideoLoop.js b/src/views/Edit/Sources/VideoLoop.js index b2db595..ac6147b 100644 --- a/src/views/Edit/Sources/VideoLoop.js +++ b/src/views/Edit/Sources/VideoLoop.js @@ -200,7 +200,7 @@ function SourceIcon(props) { const id = 'videoloop'; const name = Loop; const capabilities = ['video']; -const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0'; +const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0 || ^7.0.0'; const func = { initSettings, diff --git a/src/views/Edit/Sources/VirtualAudio.js b/src/views/Edit/Sources/VirtualAudio.js index 7fd0b91..a84fa28 100644 --- a/src/views/Edit/Sources/VirtualAudio.js +++ b/src/views/Edit/Sources/VirtualAudio.js @@ -180,7 +180,7 @@ function SourceIcon(props) { const id = 'virtualaudio'; const name = Virtual source; const capabilities = ['audio']; -const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0'; +const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0 || ^7.0.0'; const func = { initSettings, diff --git a/src/views/Edit/Sources/VirtualVideo.js b/src/views/Edit/Sources/VirtualVideo.js index b5a9baa..cb88aff 100644 --- a/src/views/Edit/Sources/VirtualVideo.js +++ b/src/views/Edit/Sources/VirtualVideo.js @@ -199,7 +199,7 @@ function SourceIcon(props) { const id = 'virtualvideo'; const name = Virtual source; const capabilities = ['video']; -const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0'; +const ffversion = '^4.1.0 || ^5.0.0 || ^6.1.0 || ^7.0.0'; const func = { initSettings,