special version of sample formatting for common cases

[platform/upstream/flac.git] / src / flac / main.c

diff --git a/src/flac/main.c b/src/flac/main.c
index ed3dfda..ae1937e 100644 (file)
--- a/src/flac/main.c
+++ b/src/flac/main.c
@@ -292,7 +292,7 @@ int main(int argc, char *argv[])
        _wildcard(&argc, &argv);
 #endif
 
-       srand(time(0));
+       srand((unsigned)time(0));
        setlocale(LC_ALL, "");
        if(!init_options()) {
                flac__utils_printf(stderr, 1, "ERROR: allocating memory\n");
@@ -1160,15 +1160,15 @@ void show_help(void)
        printf("      --tag-from-file=FIELD=FILENAME   Like --tag but gets value from file\n");
        printf("  -S, --seekpoint={#|X|#x|#s}  Add seek point(s)\n");
        printf("  -P, --padding=#              Write a PADDING block of length #\n");
-       printf("  -0, --compression-level-0, --fast  Synonymous with -l 0 -b 1152 -r 2,2\n");
-       printf("  -1, --compression-level-1          Synonymous with -l 0 -b 1152 -M -r 2,2\n");
+       printf("  -0, --compression-level-0, --fast  Synonymous with -l 0 -b 1152 -r 3\n");
+       printf("  -1, --compression-level-1          Synonymous with -l 0 -b 1152 -M -r 3\n");
        printf("  -2, --compression-level-2          Synonymous with -l 0 -b 1152 -m -r 3\n");
-       printf("  -3, --compression-level-3          Synonymous with -l 6 -b 4608 -r 3,3\n");
-       printf("  -4, --compression-level-4          Synonymous with -l 8 -b 4608 -M -r 3,3\n");
-       printf("  -5, --compression-level-5          Synonymous with -l 8 -b 4608 -m -r 3,3\n");
-       printf("  -6, --compression-level-6          Synonymous with -l 8 -b 4608 -m -r 4\n");
-       printf("  -7, --compression-level-7          Synonymous with -l 8 -b 4608 -m -e -r 6\n");
-       printf("  -8, --compression-level-8, --best  Synonymous with -l 12 -b 4608 -m -e -r 6\n");
+       printf("  -3, --compression-level-3          Synonymous with -l 6 -b 4096 -r 4\n");
+       printf("  -4, --compression-level-4          Synonymous with -l 8 -b 4096 -M -r 4\n");
+       printf("  -5, --compression-level-5          Synonymous with -l 8 -b 4096 -m -r 5\n");
+       printf("  -6, --compression-level-6          Synonymous with -l 8 -b 4096 -m -r 6\n");
+       printf("  -7, --compression-level-7          Synonymous with -l 8 -b 4096 -m -e -r 6\n");
+       printf("  -8, --compression-level-8, --best  Synonymous with -l 12 -b 4096 -m -e -r 6\n");
        printf("  -b, --blocksize=#                  Specify blocksize in samples\n");
        printf("  -m, --mid-side                     Try mid-side coding for each frame\n");
        printf("  -M, --adaptive-mid-side            Adaptive mid-side coding for all frames\n");
@@ -1429,20 +1429,20 @@ void show_explain(void)
        printf("                               block of 8192 bytes by default, or 65536 bytes\n");
        printf("                               if the input audio is more than 20 minutes long.\n");
        printf("  -b, --blocksize=#            Specify the blocksize in samples; the default is\n");
-       printf("                               1152 for -l 0, else 4608; must be one of 192,\n");
+       printf("                               1152 for -l 0, else 4096; must be one of 192,\n");
        printf("                               576, 1152, 2304, 4608, 256, 512, 1024, 2048,\n");
        printf("                               4096 (and 8192 or 16384 if the sample rate is\n");
        printf("                               >48kHz) for Subset streams.\n");
-       printf("  -0, --compression-level-0, --fast  Synonymous with -l 0 -b 1152 -r 2,2\n");
-       printf("  -1, --compression-level-1          Synonymous with -l 0 -b 1152 -M -r 2,2\n");
+       printf("  -0, --compression-level-0, --fast  Synonymous with -l 0 -b 1152 -r 3\n");
+       printf("  -1, --compression-level-1          Synonymous with -l 0 -b 1152 -M -r 3\n");
        printf("  -2, --compression-level-2          Synonymous with -l 0 -b 1152 -m -r 3\n");
-       printf("  -3, --compression-level-3          Synonymous with -l 6 -b 4608 -r 3,3\n");
-       printf("  -4, --compression-level-4          Synonymous with -l 8 -b 4608 -M -r 3,3\n");
-       printf("  -5, --compression-level-5          Synonymous with -l 8 -b 4608 -m -r 3,3\n");
+       printf("  -3, --compression-level-3          Synonymous with -l 6 -b 4096 -r 4\n");
+       printf("  -4, --compression-level-4          Synonymous with -l 8 -b 4096 -M -r 4\n");
+       printf("  -5, --compression-level-5          Synonymous with -l 8 -b 4096 -m -r 5\n");
        printf("                                     -5 is the default setting\n");
-       printf("  -6, --compression-level-6          Synonymous with -l 8 -b 4608 -m -r 4\n");
-       printf("  -7, --compression-level-7          Synonymous with -l 8 -b 4608 -m -e -r 6\n");
-       printf("  -8, --compression-level-8, --best  Synonymous with -l 12 -b 4608 -m -e -r 6\n");
+       printf("  -6, --compression-level-6          Synonymous with -l 8 -b 4096 -m -r 6\n");
+       printf("  -7, --compression-level-7          Synonymous with -l 8 -b 4096 -m -e -r 6\n");
+       printf("  -8, --compression-level-8, --best  Synonymous with -l 12 -b 4096 -m -e -r 6\n");
        printf("  -m, --mid-side                     Try mid-side coding for each frame\n");
        printf("                                     (stereo only)\n");
        printf("  -M, --adaptive-mid-side            Adaptive mid-side coding for all frames\n");