Index: fmfconv.c
===================================================================
--- fmfconv.c (revision 4398)
+++ fmfconv.c (working copy)
@@ -1423,16 +1423,21 @@
" -o --output <filename> Output file\n"
" -s --sound <filename> Output sound file\n"
" --sound-only Process only the sound from an 'fmf' file\n"
- " --mono Convert sound to mono (by default sound converted to stereo)\n"
- " --raw-sound Do not convert sound to 16 bit signed PCM and STEREO or MONO\n"
- " This is an advanced option. If stereo/mono or audio encoding\n"
- " change through 'fmf' file, your sound will be crappy.\n"
+ " --mono Convert sound to mono (by default sound\n"
+ " converted to stereo)\n"
+ " --raw-sound Do not convert sound to 16 bit signed PCM and\n"
+ " STEREO or MONO\n"
+ " This is an advanced option. If stereo/mono or\n"
+ " audio encoding change through 'fmf' file, your\n"
+ " sound will be crappy.\n"
#ifdef USE_FFMPEG
- " note: FFMPEG needs PCM audio without change the channel number too\n"
+ " note: FFMPEG needs PCM audio without change\n"
+ " the channel number too.\n"
#endif /* USE_FFMPEG */
" -w --wav Save sound to Microsoft audio (wav) file\n"
" -u --au Save sound to Sun Audio (au) file\n"
- " -m --aiff Save sound to Apple Computer audio (aiff/aiff-c) file\n"
+ " -m --aiff Save sound to Apple Computer audio (aiff/aiff-c)\n"
+ " file\n"
" --aifc Force AIFF-C output if sound format is AIFF\n"
" -Y --yuv Save video as yuv4mpeg2.\n"
" --yuv-format <frm> Set yuv4mpeg2 file frame format to 'frm',\n"
@@ -1445,39 +1450,42 @@
" 3 digit after decimal point, or a #/#\n"
" (e.g.: -f 29.97 or -f 30000/1001)\n"
" -g --progress <form> Show progress, where <form> is one of '%%', 'bar'\n"
- " 'frame' or 'time'. frame and time similar to bar\n"
- " just show movie seconds or frame number too.\n"
+ " 'frame' or 'time'. frame and time similar to\n"
+ " bar just show movie seconds or frame number\n"
+ " too.\n"
" -C --out-cut <cut> Leave out the comma delimited 'cut' ranges\n"
" e.g.: 100-200,300,500,1:11-2:22 cut the frames\n"
- " 100-200, 300, 500 and frames from 1min 11sec to\n"
- " 2min 22sec (in the given timing see:\n"
+ " 100-200, 300, 500 and frames from 1min 11sec\n"
+ " to 2min 22sec (in the given timing see:\n"
" -f/--frate\n"
#ifdef USE_FFMPEG
" -X --ffmpeg Save video and audio as FFMPEG file (default)\n"
- " -p --profile <profile> Select profile for FFMPEG output where <profile> is\n"
- " 'youtube', 'dvd' or 'ipod'\n"
+ " -p --profile <profile> Select profile for FFMPEG output where <profile>\n"
+ " is 'youtube', 'dvd' or 'ipod'\n"
" -F --format <format> Select file format for FFMPEG output (by default\n"
" filename extension used to determine)\n"
" -c --vcodec <codec> Select video codec for FFMPEG output (by default\n"
" file format determine)\n"
" -a --acodec <codec> Select audio codec for FFMPEG output (by default\n"
" file format determine)\n"
- " -A --arate <rate> Select audio bitrate for FFMPEG output (by default\n"
- " audio codec determine) where <rate> is 'default'\n"
- " or a number\n"
- " -r --vrate <rate> Select video bitrate for FFMPEG output (by default\n"
- " video codec determine) where <rate> is 'default'\n"
- " or 'ffdefault' or a number\n"
- " -R --resize <res> Resize video frame where <res> is 'vga' for 640x480,\n"
- " 'hvga' for 480x360, 'qvga' for 320x240, 'pal' for\n"
- " 768x576 (this set frame rate to 25 also) or\n"
- " WxH, Sx, N/Mx or W\n"
- " -E --srate <rate> Resample audio to <rate> sampling rate where <rate> is\n"
- " 'cd' for 44100 or 'dat' for 48000 or a number.\n"
- " ('cd' and 'dat' set 'stereo' also)\n"
+ " -A --arate <rate> Select audio bitrate for FFMPEG output (by\n"
+ " default audio codec determine) where <rate> is\n"
+ " 'default' or a number\n"
+ " -r --vrate <rate> Select video bitrate for FFMPEG output (by\n"
+ " default video codec determine) where <rate> is\n"
+ " 'default' or 'ffdefault' or a number\n"
+ " -R --resize <res> Resize video frame where <res> is 'vga' for\n"
+ " 640x480, 'hvga' for 480x360, 'qvga' for\n"
+ " 320x240, 'pal' for 768x576 (this set frame\n"
+ " rate to 25 also) or WxH, Sx, N/Mx or W\n"
+ " -E --srate <rate> Resample audio to <rate> sampling rate where\n"
+ " <rate> is 'cd' for 44100 or 'dat' for 48000 or\n"
+ " a number. ('cd' and 'dat' set 'stereo' also)\n"
" --formats List available FFMPEG formats (see -F/--format)\n"
- " --vcodecs List available FFMPEG video codecs (see -c/--vcodec)\n"
- " --acodecs List available FFMPEG audio codecs (see -a/--acodec)\n"
+ " --vcodecs List available FFMPEG video codecs (see\n"
+ " -c/--vcodec)\n"
+ " --acodecs List available FFMPEG audio codecs (see\n"
+ " -a/--acodec)\n"
#endif
" --info Scan input file(s) an print information.\n"
" -v --verbose Increase the verbosity level by one.\n"
@@ -1829,7 +1837,7 @@
}
#ifdef WIN32
else {
- setmode( fd ), O_BINARY );
+ setmode( fd, O_BINARY );
}
#endif /* #ifdef WIN32 */
}