Merge branch 'master' of github.com:mh-orange/ffmpeg

output.go

@@ -25,6 +25,7 @@ type output struct {
 	vCodecOptions []string
 
 	pix_fmt string
+	sCodec  string
 
 	format        string
 	formatOptions []string
@@ -60,6 +61,10 @@ func (out *output) process(job *transcodeJob) error {
 		job.proc.AppendArgs("-map", "0")
 	}
 
+	if out.sCodec != "" {
+		job.proc.AppendArgs("-c:s", out.sCodec)
+	}
+
 	if out.format != "" {
 		job.proc.AppendArgs("-f", out.format)
 		job.proc.AppendArgs(out.formatOptions...)
@@ -136,6 +141,14 @@ func CopyAudioOption() OutputOption {
 	return AudioCodecOption("copy")
 }
 
+// CopySubtitlesOption will set the subtitle codec to copy
+func CopySubtitlesOption() OutputOption {
+	return func(output *output) error {
+		output.sCodec = "copy"
+		return nil
+	}
+}
+
 // CopyOutput sets both the audio and video codecs to copy
 func CopyOutput() OutputOption {
 	return func(output *output) error {

transcode.go

@@ -144,10 +144,10 @@ func (job *transcodeJob) run(cancelCh chan struct{}, doneCh chan struct{}, stder
 
 	job.err = job.proc.Wait()
 	if job.err != nil {
-		if len(job.log) > 2 {
+		if len(job.log) >= 2 {
 			job.err = errors.New(strings.Join(job.log[len(job.log)-2:], "\n"))
-		} else {
-			job.err = errors.New(strings.Join(job.log, "\n"))
+		} else if len(job.log) == 1 {
+			job.err = errors.New(job.log[0])
 		}
 	}
 }