Merge branch 'dev' into vod

.github_build/Build.bundle.cuda.env

@@ -1,3 +1,3 @@
 # CORE NVIDIA CUDA BUNDLE
-FFMPEG_VERSION=5.1.2
+FFMPEG_VERSION=5.1.3
 CUDA_VERSION=11.7.1

.github_build/Build.bundle.env

@@ -1,2 +1,2 @@
 # CORE BUNDLE
-FFMPEG_VERSION=5.1.2
+FFMPEG_VERSION=5.1.3

.github_build/Build.bundle.rpi.env

@@ -1,2 +1,2 @@
 # CORE RASPBERRY-PI BUNDLE
-FFMPEG_VERSION=5.1.2
+FFMPEG_VERSION=5.1.3

.github_build/Build.bundle.vaapi.env

@@ -1,2 +1,2 @@
 # CORE BUNDLE
-FFMPEG_VERSION=5.1.2
+FFMPEG_VERSION=5.1.3

CHANGELOG.md

@@ -14,6 +14,7 @@
 -   Add support for input framerate data from jsonstats patch
 -   Add number of keyframes and extradata size to process progress data
 -   Fix placeholder parameter parsing
+-   Mod bumps FFmpeg to v5.1.3 (datarhei/core:tag bundles)
 -   Fix better naming for storage endpoint documentation
 -   Fix freeing up S3 mounts
 -   Fix URL validation if the path contains FFmpeg specific placeholders

net/url/url_test.go

@@ -55,7 +55,7 @@ func TestScheme(t *testing.T) {
 	require.False(t, r)
 }
 
-func TestPars(t *testing.T) {
+func TestParse(t *testing.T) {
 	u, err := Parse("http://localhost/foobar")
 	require.NoError(t, err)
 	require.Equal(t, &URL{

restream/fs/fs_test.go

@@ -78,7 +78,7 @@ func TestMaxAge(t *testing.T) {
 
 	require.Eventually(t, func() bool {
 		return cleanfs.Files() == 0
-	}, 5*time.Second, time.Second)
+	}, 10*time.Second, time.Second)
 
 	cleanfs.WriteFileReader("/chunk_3.ts", strings.NewReader("chunk_3"))
 
@@ -96,7 +96,7 @@ func TestMaxAge(t *testing.T) {
 		require.ElementsMatch(t, []string{"/chunk_3.ts"}, names)
 
 		return true
-	}, 2*time.Second, time.Second)
+	}, 5*time.Second, time.Second)
 
 	cleanfs.Stop()
 }