Merge branch 'master' into master

transcoder/transcoder.go

@@ -246,6 +246,16 @@ func (t *Transcoder) Run(progress bool) <-chan error {
 			close(done)
 			return
 		}
+
+		// Run the pipe-in command if it has been set
+		if t.mediafile.InputPipeCommand() != nil {
+			if err := t.mediafile.InputPipeCommand().Run(); err != nil {
+				done <- fmt.Errorf("Failed execution of pipe-in command (%s) with %s", t.mediafile.InputPipeCommand().Args, err)
+				close(done)
+				return
+			}
+		}
+
 		err = proc.Wait()
 		go t.closePipes()
 		if err != nil {