From 60163e007dd3386f8b1acc58aca8b9df7217ef7a Mon Sep 17 00:00:00 2001 From: Saxon1 Date: Thu, 19 Apr 2018 13:42:36 +0930 Subject: [PATCH] Fixing some syntax errors --- revid/Config.go | 12 +----------- revid/Revid.go | 1 + 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/revid/Config.go b/revid/Config.go index d792704b..6012bf57 100644 --- a/revid/Config.go +++ b/revid/Config.go @@ -75,7 +75,6 @@ const ( Mpegts = 9 Rtmp = 10 Ffmpeg = 11 - Revid = 12 Flv = 13 LibRtmp = 14 QuantizationOn = 15 @@ -83,6 +82,7 @@ const ( Yes = 17 No = 18 NativeRtmp = 19 + FfmpegRtmp = 20 ) // Default config settings @@ -189,16 +189,6 @@ func (config *Config) Validate(r *revid) error { return errors.New("Bad output type defined in config!") } - switch config.RtmpMethod { - case LibRtmp: - case Ffmpeg: - case NothingDefined: - r.Log(Warning, "No RTMP encoding method defined, defautling to ffmpeg!") - config.RtmpEncodingMethod = Ffmpeg - default: - return errors.New("Bad rtmp method defined in config!") - } - switch config.Packetization { case None: case Mpegts: diff --git a/revid/Revid.go b/revid/Revid.go index 75717741..d29c76f1 100644 --- a/revid/Revid.go +++ b/revid/Revid.go @@ -300,6 +300,7 @@ func (r *revid) packClips() { packetCount := 0 for { // Get some memory from the ring buffer for out clip + var clip []byte if clip, err := r.ringBuffer.Get(); err != nil { r.Log(Error, err.Error()) r.Log(Warning, "Clearing output chan!")