Imported Upstream version 0.12.1

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 0d7f400..57fa31d 100644 (file)
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,6 @@
 {
   "git": {
-    "sha1": "e133798fb00969cad0561f0e92291d2d02803497"
-  }
-}
+    "sha1": "879363553fedc9bac17e0da7d84971af8dacd441"
+  },
+  "path_in_vcs": "mp4parse"
+}
\ No newline at end of file

diff --git a/Cargo.toml b/Cargo.toml
index e369c2b..a2bfdcf 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,11 +11,21 @@
 
 [package]
 name = "mp4parse"
-version = "0.12.0"
-authors = ["Ralph Giles <giles@mozilla.com>", "Matthew Gregan <kinetik@flim.org>", "Alfredo Yang <ayang@mozilla.com>", "Jon Bauman <jbauman@mozilla.com>", "Bryce Seager van Dyk <bvandyk@mozilla.com>"]
-exclude = ["*.mp4", "av1-avif/*"]
+version = "0.12.1"
+authors = [
+    "Ralph Giles <giles@mozilla.com>",
+    "Matthew Gregan <kinetik@flim.org>",
+    "Alfredo Yang <ayang@mozilla.com>",
+    "Jon Bauman <jbauman@mozilla.com>",
+    "Bryce Seager van Dyk <bvandyk@mozilla.com>",
+]
+exclude = [
+    "*.mp4",
+    "av1-avif/*",
+]
 description = "Parser for ISO base media file format (mp4)"
 documentation = "https://docs.rs/mp4parse/"
+readme = "README.md"
 categories = ["multimedia::video"]
 license = "MPL-2.0"
 repository = "https://github.com/mozilla/mp4parse-rust"
@@ -26,6 +36,7 @@ bench = false
 [[bench]]
 name = "avif_benchmark"
 harness = false
+
 [dependencies.bitreader]
 version = "0.3.2"
 
@@ -47,6 +58,7 @@ version = "0.2.14"
 
 [dependencies.static_assertions]
 version = "1.1.0"
+
 [dev-dependencies.criterion]
 version = "0.3"
 
@@ -62,5 +74,6 @@ meta-xml = []
 missing-pixi-permitted = []
 mp4v = []
 unstable-api = []
+
 [badges.travis-ci]
 repository = "https://github.com/mozilla/mp4parse-rust"

diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 1639edd..6622b64 100644 (file)
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "mp4parse"
-version = "0.12.0"
+version = "0.12.1"
 authors = [
   "Ralph Giles <giles@mozilla.com>",
   "Matthew Gregan <kinetik@flim.org>",

diff --git a/src/lib.rs b/src/lib.rs
index 464944f..566c2b3 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2543,8 +2543,13 @@ macro_rules! impl_mul {
             type Output = $output;
 
             fn mul(self, rhs: $rhs) -> Self::Output {
-                static_assertions::const_assert!(<$output>::MAX <= <$inner>::MAX as u64);
-                static_assertions::const_assert!(<$lhs>::MAX * <$rhs>::MAX <= <$output>::MAX);
+                static_assertions::const_assert!(
+                    <$output as UpperBounded>::MAX <= <$inner>::MAX as u64
+                );
+                static_assertions::const_assert!(
+                    <$lhs as UpperBounded>::MAX * <$rhs as UpperBounded>::MAX
+                        <= <$output as UpperBounded>::MAX
+                );
 
                 let lhs: $inner = self.get().into();
                 let rhs: $inner = rhs.get().into();