change default seektable from "-S 100x" to "-S 10s"

diff --git a/doc/html/documentation.html b/doc/html/documentation.html
index 2ca07c4..5cfa9e8 100644 (file)
--- a/doc/html/documentation.html
+++ b/doc/html/documentation.html
@@ -528,7 +528,7 @@
                                </LI>
                                </UL>
                                You may use many -S options; the resulting SEEKTABLE will be the unique-ified union of all such values.<BR>
-                               With no -S options, flac defaults to '-S 100x'.  Use --no-seektable for no SEEKTABLE.<BR>
+                               With no -S options, flac defaults to '-S 10s'.  Use --no-seektable for no SEEKTABLE.<BR>
                                <B>NOTE:</B> -S #x and -S #s will not work if the encoder can't determine the input size before starting.<BR>
                                <B>NOTE:</B> if you use -S # and # is &gt;= samples in the input, there will be either no seek point entered (if the input size is determinable before encoding starts) or a placeholder point (if input size is not determinable).<BR>
                        </TD>

diff --git a/man/flac.sgml b/man/flac.sgml
index 484c910..cf742e9 100644 (file)
--- a/man/flac.sgml
+++ b/man/flac.sgml
@@ -4,7 +4,7 @@
   <!ENTITY dhfirstname "<firstname>Matt</firstname>">
   <!ENTITY dhsurname   "<surname>Zimmerman</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>December 18, 2002</date>">
+  <!ENTITY dhdate      "<date>December 30, 2002</date>">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
@@ -359,7 +359,7 @@
                    meaning a seekpoint every 9.5 seconds).  You may use
                    many -S options; the resulting SEEKTABLE will be the
                    unique-ified union of all such values.  With no -S
-                   options, flac defaults to '-S 100x'.  Use --no-seektable
+                   options, flac defaults to '-S 10s'.  Use --no-seektable
                    for no SEEKTABLE.  Note: '-S #x' and '-S #s' will not
                    work if the encoder can't determine the input size before
                    starting.  Note: if you use '-S #' and # is >=

diff --git a/src/flac/encode.c b/src/flac/encode.c
index 9748365..367a3ce 100644 (file)
--- a/src/flac/encode.c
+++ b/src/flac/encode.c
@@ -1556,7 +1556,7 @@ FLAC__bool convert_to_seek_table_template(const char *requested_seek_points, int
                return true;
 
        if(num_requested_seek_points < 0) {
-               requested_seek_points = "100x;";
+               requested_seek_points = "10s;";
                num_requested_seek_points = 1;
        }
 

diff --git a/src/flac/main.c b/src/flac/main.c
index 19c3026..8c46458 100644 (file)
--- a/src/flac/main.c
+++ b/src/flac/main.c
@@ -1305,7 +1305,7 @@ void show_explain()
        printf("       #s : a seekpoint every # seconds; # does not have to be a whole number\n");
        printf("     You may use many -S options; the resulting SEEKTABLE will be the unique-\n");
        printf("           ified union of all such values.\n");
-       printf("     With no -S options, flac defaults to '-S 100x'.  Use -S- for no SEEKTABLE.\n");
+       printf("     With no -S options, flac defaults to '-S 10s'.  Use -S- for no SEEKTABLE.\n");
        printf("     Note: -S #x and -S #s will not work if the encoder can't determine the\n");
        printf("           input size before starting.\n");
        printf("     Note: if you use -S # and # is >= samples in the input, there will be\n");