core: implement Default for NATimePoint

[nihav.git] / nihav-core / src / frame.rs

diff --git a/nihav-core/src/frame.rs b/nihav-core/src/frame.rs
index 741c17535532d5e4447ccf186bf21c5df3a5c818..80f1adf4c4b8b6b5e3511b0610ee104e47089492 100644 (file)
--- a/nihav-core/src/frame.rs
+++ b/nihav-core/src/frame.rs
@@ -1009,6 +1009,12 @@ pub enum NATimePoint {
     None,
 }
 
+impl Default for NATimePoint {
+    fn default() -> Self {
+        NATimePoint::None
+    }
+}
+
 impl fmt::Display for NATimePoint {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
@@ -1105,7 +1111,7 @@ impl FromStr for NATimePoint {
                     let ret = parts.next().unwrap().parse::<u64>();
                     if ret.is_err() { return Err(FormatParseError {}); }
                     let seconds = ret.unwrap();
-                    if seconds >= 60 { return Err(FormatParseError {}); }
+                    if mins.is_some() && seconds >= 60 { return Err(FormatParseError {}); }
                     let millis = if let Some(val) = parts.next() {
                             let mut mval = 0;
                             let mut base = 0;