Bulk update copyright dates
[flac.git] / src / share / grabbag / seektable.c
index 29a774a..01118d5 100644 (file)
@@ -1,6 +1,6 @@
 /* grabbag - Convenience lib for various routines common to several tools
  * Copyright (C) 2002-2009  Josh Coalson
- * Copyright (C) 2011-2013  Xiph.Org Foundation
+ * Copyright (C) 2011-2016  Xiph.Org Foundation
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
@@ -34,7 +34,7 @@ FLAC__bool grabbag__seektable_convert_specification_to_template(const char *spec
 
        FLAC__ASSERT(0 != spec);
        FLAC__ASSERT(0 != seektable_template);
-       FLAC__ASSERT(seektable_template->type = FLAC__METADATA_TYPE_SEEKTABLE);
+       FLAC__ASSERT(seektable_template->type == FLAC__METADATA_TYPE_SEEKTABLE);
 
        if(0 != spec_has_real_points)
                *spec_has_real_points = false;
@@ -69,6 +69,8 @@ FLAC__bool grabbag__seektable_convert_specification_to_template(const char *spec
                                                const double sec = atof(pt);
                                                if(sec > 0.0) {
                                                        unsigned samples = (unsigned)(sec * (double)sample_rate);
+                                                       /* Restrict seekpoints to two per second of audio. */
+                                                       samples = samples < sample_rate / 2 ? sample_rate / 2 : samples;
                                                        if(samples > 0) {
                                                                /* +1 for the initial point at sample 0 */
                                                                if(!FLAC__metadata_object_seektable_template_append_spaced_points_by_samples(seektable_template, samples, total_samples_to_encode))