diff --git a/examples/example_test.go b/examples/example_test.go index 4624454..be91bfc 100644 --- a/examples/example_test.go +++ b/examples/example_test.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/disintegration/imaging" + ffmpeg "github.com/goodwin332/ffmpeg-go" "github.com/stretchr/testify/assert" - ffmpeg "github.com/u2takey/ffmpeg-go" ) // diff --git a/examples/limitcpu_test.go b/examples/limitcpu_test.go index 126e15a..5b4e61f 100644 --- a/examples/limitcpu_test.go +++ b/examples/limitcpu_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - ffmpeg "github.com/u2takey/ffmpeg-go" + ffmpeg "github.com/goodwin332/ffmpeg-go" ) func ComplexFilterExample(testInputFile, testOverlayFile, testOutputFile string) *ffmpeg.Stream { diff --git a/examples/opencv_test.go b/examples/opencv_test.go index 95024e1..34300f0 100644 --- a/examples/opencv_test.go +++ b/examples/opencv_test.go @@ -12,7 +12,7 @@ import ( "log" "testing" - ffmpeg "github.com/u2takey/ffmpeg-go" + ffmpeg "github.com/goodwin332/ffmpeg-go" "gocv.io/x/gocv" ) diff --git a/examples/readFrameAsJpeg.go b/examples/readFrameAsJpeg.go index 737e59b..51e879a 100644 --- a/examples/readFrameAsJpeg.go +++ b/examples/readFrameAsJpeg.go @@ -6,7 +6,7 @@ import ( "io" "os" - ffmpeg "github.com/u2takey/ffmpeg-go" + ffmpeg "github.com/goodwin332/ffmpeg-go" ) func ExampleReadFrameAsJpeg(inFileName string, frameNum int) io.Reader { diff --git a/examples/showProgress.go b/examples/showProgress.go index c9d4fd8..1587f68 100644 --- a/examples/showProgress.go +++ b/examples/showProgress.go @@ -12,8 +12,8 @@ import ( "strings" "time" + ffmpeg "github.com/goodwin332/ffmpeg-go" "github.com/tidwall/gjson" - ffmpeg "github.com/u2takey/ffmpeg-go" ) // ExampleShowProgress is an example of using the ffmpeg `-progress` option with a diff --git a/examples/stream.go b/examples/stream.go index 9c4bdcc..3053588 100644 --- a/examples/stream.go +++ b/examples/stream.go @@ -6,7 +6,7 @@ import ( "io" "log" - ffmpeg "github.com/u2takey/ffmpeg-go" + ffmpeg "github.com/goodwin332/ffmpeg-go" ) // ExampleStream diff --git a/go.mod b/go.mod index 1e16544..eb41547 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/u2takey/ffmpeg-go +module github.com/goodwin332/ffmpeg-go go 1.14 diff --git a/go.sum b/go.sum index 630c9c0..baa7d73 100644 --- a/go.sum +++ b/go.sum @@ -13,6 +13,7 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -45,6 +46,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -52,6 +54,7 @@ golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/run.go b/run.go index f657d67..397a0cd 100644 --- a/run.go +++ b/run.go @@ -8,6 +8,7 @@ import ( "os" "os/exec" "sort" + "strconv" "strings" "time" ) @@ -68,6 +69,11 @@ func _getAllLabelsInSorted(m map[Label]NodeInfo) []Label { r = append(r, a) } sort.Slice(r, func(i, j int) bool { + if intI, err := strconv.Atoi(string(r[i])); err == nil { + if intJ, err := strconv.Atoi(string(r[j])); err == nil { + return intI < intJ + } + } return r[i] < r[j] }) return r