diff --git a/main.go b/main.go
index 201266c..7100888 100644
--- a/main.go
+++ b/main.go
@@ -137,29 +137,36 @@ func ugoira2videoCmd(args []string, flags CliFlags) {
 	if len(args) < 2 {
 		die("expected ugoira zip file and manifest JSON")
 	}
-	_, manifestFileName := args[0], args[1]
+	ugoiraFileName, manifestFileName := args[0], args[1]
 	mfp, err := os.Open(manifestFileName)
 	if err != nil {
 		die("Could not open manifest file: %s", err)
 	}
 	defer mfp.Close()
+
 	manifestData, err := io.ReadAll(mfp)
 	if err != nil {
 		die("Could not read manifest: %s", err)
 	}
-	ugoira2video(decodeUgoiraManifest(manifestData))
+
+	err = ugoira2video(decodeUgoiraManifest(manifestData), ugoiraFileName, flags.outputFileName)
+	if err != nil {
+		die("Conversion failed: %s", err)
+	}
 }
 
 func main() {
 	var flags CliFlags
-	downloadCmd := flag.NewFlagSet("download", flag.ExitOnError)
-	u2vCmd := flag.NewFlagSet("u2v", flag.ExitOnError)
 
+	downloadCmd := flag.NewFlagSet("download", flag.ExitOnError)
 	downloadCmd.StringVar(&flags.outputFileName, "o", "", "Ugoira output file name")
 	downloadCmd.StringVar(&flags.manifestFileName, "M", "", "Ugoira manifest output file name")
 	downloadCmd.StringVar(&flags.userAgent, "A", "", "User agent to use when doing GET requests")
 	downloadCmd.BoolVar(&flags.verbose, "v", false, "Enable verbosity")
 
+	u2vCmd := flag.NewFlagSet("u2v", flag.ExitOnError)
+	u2vCmd.StringVar(&flags.outputFileName, "o", "", "Converted Ugoira output file")
+
 	if len(os.Args) < 2 {
 		die("expected command")
 	}