Revert "Import cameraiq fork"

franktinsley · franktinsley · commit 87467d5fa515 · 2020-06-01T15:59:02.000-07:00
This reverts commit ae6fef1.
diff --git a/ffmpeg/ffmpeg.go b/ffmpeg/ffmpeg.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"strings"
 
-	"github.com/cameraiq/goffmpeg/utils"
+	"github.com/xfrr/goffmpeg/utils"
 )
 
 // Configuration ...
diff --git a/go.mod b/go.mod
@@ -2,7 +2,4 @@ module github.com/xfrr/goffmpeg
 
 go 1.14
 
-require (
-	github.com/cameraiq/goffmpeg v0.0.0-20191108092855-c49093f2d9f7
-	github.com/stretchr/testify v1.5.1
-)
+require github.com/stretchr/testify v1.5.1
diff --git a/go.sum b/go.sum
@@ -1,5 +1,3 @@
-github.com/cameraiq/goffmpeg v0.0.0-20191108092855-c49093f2d9f7 h1:ScvAEdcEHWFKntB9YrNgZ3K+n5L8iToH+F7MS2EoYw8=
-github.com/cameraiq/goffmpeg v0.0.0-20191108092855-c49093f2d9f7/go.mod h1:dEir+jl1FDIexS0ZHZaU6aZ7B0B8NA9b7uXy8pDuw0c=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
diff --git a/tests/transcoding_test.go b/tests/transcoding_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/cameraiq/goffmpeg/transcoder"
+	"github.com/xfrr/goffmpeg/transcoder"
 )
 
 func TestInputNotFound(t *testing.T) {
diff --git a/transcoder/transcoder.go b/transcoder/transcoder.go
@@ -12,9 +12,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cameraiq/goffmpeg/ffmpeg"
-	"github.com/cameraiq/goffmpeg/models"
-	"github.com/cameraiq/goffmpeg/utils"
+	"github.com/xfrr/goffmpeg/ffmpeg"
+	"github.com/xfrr/goffmpeg/models"
+	"github.com/xfrr/goffmpeg/utils"
 )
 
 // Transcoder Main struct
diff --git a/utils/utils.go b/utils/utils.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cameraiq/goffmpeg/models"
+	"github.com/xfrr/goffmpeg/models"
 )
 
 func DurToSec(dur string) (sec float64) {

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"strings"`
`6`	`6`
`7`		`- "github.com/cameraiq/goffmpeg/utils"`
	`7`	`+ "github.com/xfrr/goffmpeg/utils"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// Configuration ...`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-github.com/cameraiq/goffmpeg v0.0.0-20191108092855-c49093f2d9f7 h1:ScvAEdcEHWFKntB9YrNgZ3K+n5L8iToH+F7MS2EoYw8=`
`2`		`-github.com/cameraiq/goffmpeg v0.0.0-20191108092855-c49093f2d9f7/go.mod h1:dEir+jl1FDIexS0ZHZaU6aZ7B0B8NA9b7uXy8pDuw0c=`
`3`	`1`	`github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=`
`4`	`2`	`github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=`
`5`	`3`	`github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/stretchr/testify/assert"`
`10`	`10`
`11`		`- "github.com/cameraiq/goffmpeg/transcoder"`
	`11`	`+ "github.com/xfrr/goffmpeg/transcoder"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func TestInputNotFound(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"strconv"`
`8`	`8`	`"strings"`
`9`	`9`
`10`		`- "github.com/cameraiq/goffmpeg/models"`
	`10`	`+ "github.com/xfrr/goffmpeg/models"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func DurToSec(dur string) (sec float64) {`