From a9a9c54b6cfc01344e54f5f510700f1fbd7f43b2 Mon Sep 17 00:00:00 2001
From: Andrew Kidd <contact@andrewiankidd.co.uk>
Date: Fri, 14 May 2021 16:26:27 +0100
Subject: [PATCH 1/2] expose ProbeWithTimeout functionality without default
 options

---
 probe.go | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/probe.go b/probe.go
index 83001a6..14a4530 100644
--- a/probe.go
+++ b/probe.go
@@ -13,8 +13,17 @@ func Probe(fileName string, kwargs ...KwArgs) (string, error) {
 }
 
 func ProbeWithTimeout(fileName string, timeOut time.Duration, kwargs KwArgs) (string, error) {
-	args := []string{"-show_format", "-show_streams", "-of", "json"}
-	args = append(args, ConvertKwargsToCmdLineArgs(kwargs)...)
+	args := KwArgs{
+		"show_format":  "",
+		"show_streams": "",
+		"of":           "json",
+	}
+
+	return ProbeWithTimeoutExec(fileName, 0, MergeKwArgs([]KwArgs{args, kwargs}))
+}
+
+func ProbeWithTimeoutExec(fileName string, timeOut time.Duration, kwargs KwArgs) (string, error) {
+	args := ConvertKwargsToCmdLineArgs(kwargs)
 	args = append(args, fileName)
 	ctx := context.Background()
 	if timeOut > 0 {

From 333c4cc41e6bf7c9472779d0ac09d0d0316d1f7c Mon Sep 17 00:00:00 2001
From: Andrew Kidd <contact@andrewiankidd.co.uk>
Date: Fri, 14 May 2021 18:58:28 +0100
Subject: [PATCH 2/2] timeOut passthrough

---
 probe.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/probe.go b/probe.go
index 14a4530..7f1318a 100644
--- a/probe.go
+++ b/probe.go
@@ -19,7 +19,7 @@ func ProbeWithTimeout(fileName string, timeOut time.Duration, kwargs KwArgs) (st
 		"of":           "json",
 	}
 
-	return ProbeWithTimeoutExec(fileName, 0, MergeKwArgs([]KwArgs{args, kwargs}))
+	return ProbeWithTimeoutExec(fileName, timeOut, MergeKwArgs([]KwArgs{args, kwargs}))
 }
 
 func ProbeWithTimeoutExec(fileName string, timeOut time.Duration, kwargs KwArgs) (string, error) {