API tools faq
paste
Advertisement
sbaldovi

fuse-utils.fmfx_80cols.diff

sbaldovi
May 2nd, 2011
185
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.22 KB | None | 0 0
raw download clone embed print report
  1. Index: fmfconv.c
  2. ===================================================================
  3. --- fmfconv.c   (revision 4398)
  4. +++ fmfconv.c   (working copy)
  5. @@ -1423,16 +1423,21 @@
  6.       "  -o --output <filename>       Output file\n"
  7.       "  -s --sound <filename>        Output sound file\n"
  8.       "     --sound-only              Process only the sound from an 'fmf' file\n"
  9. -     "     --mono                    Convert sound to mono (by default sound converted to stereo)\n"
  10. -     "     --raw-sound               Do not convert sound to 16 bit signed PCM and STEREO or MONO\n"
  11. -     "                                 This is an advanced option. If stereo/mono or audio encoding\n"
  12. -     "                                 change through 'fmf' file, your sound will be crappy.\n"
  13. +     "     --mono                    Convert sound to mono (by default sound\n"
  14. +     "                                 converted to stereo)\n"
  15. +     "     --raw-sound               Do not convert sound to 16 bit signed PCM and\n"
  16. +     "                                 STEREO or MONO\n"
  17. +     "                                 This is an advanced option. If stereo/mono or\n"
  18. +     "                                 audio encoding change through 'fmf' file, your\n"
  19. +     "                                 sound will be crappy.\n"
  20.  #ifdef USE_FFMPEG
  21. -     "                                 note: FFMPEG needs PCM audio without change the channel number too\n"
  22. +     "                                 note: FFMPEG needs PCM audio without change\n"
  23. +     "                                 the channel number too.\n"
  24.  #endif /* USE_FFMPEG */
  25.       "  -w --wav                     Save sound to Microsoft audio (wav) file\n"
  26.       "  -u --au                      Save sound to Sun Audio (au) file\n"
  27. -     "  -m --aiff                    Save sound to Apple Computer audio (aiff/aiff-c) file\n"
  28. +     "  -m --aiff                    Save sound to Apple Computer audio (aiff/aiff-c)\n"
  29. +     "                                 file\n"
  30.       "     --aifc                    Force AIFF-C output if sound format is AIFF\n"
  31.       "  -Y --yuv                     Save video as yuv4mpeg2.\n"
  32.       "     --yuv-format <frm>        Set yuv4mpeg2 file frame format to 'frm',\n"
  33. @@ -1445,39 +1450,42 @@
  34.       "                                 3 digit after decimal point, or a #/#\n"
  35.       "                                 (e.g.: -f 29.97 or -f 30000/1001)\n"
  36.       "  -g --progress <form>         Show progress, where <form> is one of '%%', 'bar'\n"
  37. -     "                                 'frame' or 'time'. frame and time similar to bar\n"
  38. -     "                                 just show movie seconds or frame number too.\n"
  39. +     "                                 'frame' or 'time'. frame and time similar to\n"
  40. +     "                                 bar just show movie seconds or frame number\n"
  41. +     "                                 too.\n"
  42.       "  -C --out-cut <cut>           Leave out the comma delimited 'cut' ranges\n"
  43.       "                                 e.g.: 100-200,300,500,1:11-2:22 cut the frames\n"
  44. -     "                                 100-200, 300, 500 and frames from 1min 11sec to\n"
  45. -     "                                 2min 22sec (in the given timing see:\n"
  46. +     "                                 100-200, 300, 500 and frames from 1min 11sec\n"
  47. +     "                                 to 2min 22sec (in the given timing see:\n"
  48.       "                                 -f/--frate\n"
  49.  #ifdef USE_FFMPEG
  50.       "  -X --ffmpeg                  Save video and audio as FFMPEG file (default)\n"
  51. -     "  -p --profile <profile>       Select profile for FFMPEG output where <profile> is\n"
  52. -     "                                 'youtube', 'dvd' or 'ipod'\n"
  53. +     "  -p --profile <profile>       Select profile for FFMPEG output where <profile>\n"
  54. +     "                                 is 'youtube', 'dvd' or 'ipod'\n"
  55.       "  -F --format <format>         Select file format for FFMPEG output (by default\n"
  56.       "                                 filename extension used to determine)\n"
  57.       "  -c --vcodec <codec>          Select video codec for FFMPEG output (by default\n"
  58.       "                                 file format determine)\n"
  59.       "  -a --acodec <codec>          Select audio codec for FFMPEG output (by default\n"
  60.       "                                 file format determine)\n"
  61. -     "  -A --arate <rate>            Select audio bitrate for FFMPEG output (by default\n"
  62. -     "                                 audio codec determine) where <rate> is 'default'\n"
  63. -     "                                 or a number\n"
  64. -     "  -r --vrate <rate>            Select video bitrate for FFMPEG output (by default\n"
  65. -     "                                 video codec determine) where <rate> is 'default'\n"
  66. -     "                                 or 'ffdefault' or a number\n"
  67. -     "  -R --resize <res>            Resize video frame where <res> is 'vga' for 640x480,\n"
  68. -     "                                 'hvga' for 480x360, 'qvga' for 320x240, 'pal' for\n"
  69. -     "                                 768x576 (this set frame rate to 25 also) or\n"
  70. -     "                                 WxH, Sx, N/Mx or W\n"
  71. -     "  -E --srate <rate>            Resample audio to <rate> sampling rate where <rate> is\n"
  72. -     "                                 'cd' for 44100 or 'dat' for 48000 or a number.\n"
  73. -     "                                 ('cd' and 'dat' set 'stereo' also)\n"
  74. +     "  -A --arate <rate>            Select audio bitrate for FFMPEG output (by\n"
  75. +     "                                 default audio codec determine) where <rate> is\n"
  76. +     "                                 'default' or a number\n"
  77. +     "  -r --vrate <rate>            Select video bitrate for FFMPEG output (by\n"
  78. +     "                                 default video codec determine) where <rate> is\n"
  79. +     "                                 'default' or 'ffdefault' or a number\n"
  80. +     "  -R --resize <res>            Resize video frame where <res> is 'vga' for\n"
  81. +     "                                 640x480, 'hvga' for 480x360, 'qvga' for\n"
  82. +     "                                 320x240, 'pal' for 768x576 (this set frame\n"
  83. +     "                                 rate to 25 also) or WxH, Sx, N/Mx or W\n"
  84. +     "  -E --srate <rate>            Resample audio to <rate> sampling rate where\n"
  85. +     "                                 <rate> is 'cd' for 44100 or 'dat' for 48000 or\n"
  86. +     "                                 a number. ('cd' and 'dat' set 'stereo' also)\n"
  87.       "     --formats                 List available FFMPEG formats (see -F/--format)\n"
  88. -     "     --vcodecs                 List available FFMPEG video codecs (see -c/--vcodec)\n"
  89. -     "     --acodecs                 List available FFMPEG audio codecs (see -a/--acodec)\n"
  90. +     "     --vcodecs                 List available FFMPEG video codecs (see\n"
  91. +     "                                 -c/--vcodec)\n"
  92. +     "     --acodecs                 List available FFMPEG audio codecs (see\n"
  93. +     "                                 -a/--acodec)\n"
  94.  #endif
  95.       "     --info                    Scan input file(s) an print information.\n"
  96.       "  -v --verbose                 Increase the verbosity level by one.\n"
  97. @@ -1829,7 +1837,7 @@
  98.      }
  99.  #ifdef WIN32
  100.      else {
  101. -      setmode( fd ), O_BINARY );
  102. +      setmode( fd, O_BINARY );
  103.      }
  104.  #endif             /* #ifdef WIN32 */
  105.    }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!