fix merge output; support error to stdout

This commit is contained in:
wanglei.w
2021-06-25 18:54:51 +08:00
parent ea7295fb23
commit 6c40f6e9bb
4 changed files with 21 additions and 5 deletions

View File

@@ -52,10 +52,7 @@ func (s *Stream) OverwriteOutput(stream *Stream) *Stream {
}
// Include all given outputs in one ffmpeg command line
func (s *Stream) MergeOutputs(streams ...*Stream) *Stream {
if s.Type != "OutputStream" {
panic("cannot merge outputs on non-OutputStream")
}
func MergeOutputs(streams ...*Stream) *Stream {
return NewMergeOutputsNode("merge_output", streams).Stream("", "")
}