Merge branch 'master' into mts-chunking

This commit is contained in:
Saxon 2019-02-28 18:00:20 +10:30
commit 651e4d892a
1 changed files with 2 additions and 2 deletions

View File

@ -120,7 +120,7 @@ func handleFlags() revid.Config {
rtmpMethodPtr = flag.String("RtmpMethod", "", "The method used to send over rtmp: Ffmpeg, Librtmp") rtmpMethodPtr = flag.String("RtmpMethod", "", "The method used to send over rtmp: Ffmpeg, Librtmp")
packetizationPtr = flag.String("Packetization", "", "The method of data packetisation: Flv, Mpegts, None") packetizationPtr = flag.String("Packetization", "", "The method of data packetisation: Flv, Mpegts, None")
quantizePtr = flag.Bool("Quantize", false, "Quantize input (non-variable bitrate)") quantizePtr = flag.Bool("Quantize", false, "Quantize input (non-variable bitrate)")
verbosityPtr = flag.String("Verbosity", "", "Verbosity: Info, Warning, Error, Fatal") verbosityPtr = flag.String("Verbosity", "Info", "Verbosity: Info, Warning, Error, Fatal")
framesPerClipPtr = flag.Uint("FramesPerClip", 0, "Number of frames per clip sent") framesPerClipPtr = flag.Uint("FramesPerClip", 0, "Number of frames per clip sent")
rtmpUrlPtr = flag.String("RtmpUrl", "", "Url of rtmp endpoint") rtmpUrlPtr = flag.String("RtmpUrl", "", "Url of rtmp endpoint")
bitratePtr = flag.Uint("Bitrate", 0, "Bitrate of recorded video") bitratePtr = flag.Uint("Bitrate", 0, "Bitrate of recorded video")
@ -157,7 +157,7 @@ func handleFlags() revid.Config {
case "Fatal": case "Fatal":
cfg.LogLevel = logger.Fatal cfg.LogLevel = logger.Fatal
default: default:
log.Log(logger.Error, pkg+"bad verbosity argument") cfg.LogLevel = defaultLogVerbosity
} }
log = logger.New(cfg.LogLevel, &smartlogger.New(*logPathPtr).LogRoller) log = logger.New(cfg.LogLevel, &smartlogger.New(*logPathPtr).LogRoller)