zishuo/goffmpeg
1
0
Fork 0
mirror of https://github.com/xfrr/goffmpeg.git synced 2025-10-05 14:46:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update transcoder.go

Browse Source
This commit is contained in:
gongym
2020-08-25 13:38:05 +08:00
committed by GitHub
parent d910add319
commit aa6bff624d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
transcoder/transcoder.go
View File

@@ -306,14 +306,16 @@ func (t Transcoder) Output() <-chan models.Progress {
if atEOF && len(data) == 0 {
return 0, nil, nil
}
if i := bytes.IndexByte(data, '\n'); i >= 0 {
// We have a full newline-terminated line.
return i + 1, data[0:i], nil
}
//windows \r\n
//so first \r and then \n can remove unexpected line break
if i := bytes.IndexByte(data, '\r'); i >= 0 {
// We have a cr terminated line
return i + 1, data[0:i], nil
}
if i := bytes.IndexByte(data, '\n'); i >= 0 {
// We have a full newline-terminated line.
return i + 1, data[0:i], nil
}
if atEOF {
return len(data), data, nil
}