Merge branch 'master' of github.com:Themaister/SSNES

mme4crt · Sep 2, 2011 · 9588f60 · 9588f60
2 parents 57c25dc + 38763c4
commit 9588f60
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docs/ssnes.1 b/docs/ssnes.1
@@ -112,7 +112,8 @@ Connects a four-way multitap into port 2 of the SNES. This allows for up to 5 pl
 
 .TP
 \fB--record PATH, -r PATH\fR
-Activates video recording of gameplay into PATH. Video recording options can be configured in config file.
+Activates video recording of gameplay into PATH. Using .mkv extension is recommended.
+Codecs used are FFV1/FLAC, suitable for processing the material further.
 
 .TP
 \fB--bsvplay PATH, -P PATH\fR

diff --git a/ssnes.c b/ssnes.c
@@ -401,7 +401,7 @@ static void print_help(void)
 #endif
 
 #ifdef HAVE_FFMPEG
-   puts("\t-r/--record: Path to record video file.\n\t\tSettings for video/audio codecs are found in config file.");
+   puts("\t-r/--record: Path to record video file.\n\t\tUsing .mkv extension is recommended, and codecs used are FFV1/FLAC.");
 #endif
    puts("\t-v/--verbose: Verbose logging.");
    puts("\t-U/--ups: Specifies path for UPS patch that will be applied to ROM.");