diff options
80 files changed, 80 insertions, 80 deletions
diff --git a/audio/claxon/Cargo.toml b/audio/claxon/Cargo.toml index d463ef3d..829d3536 100644 --- a/audio/claxon/Cargo.toml +++ b/audio/claxon/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-claxon" version = "0.9.0" authors = ["Ruben Gonzalez <rgonzalez@fluendo.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Claxon FLAC Decoder Plugin" edition = "2021" rust-version = "1.57" diff --git a/audio/claxon/src/claxondec/imp.rs b/audio/claxon/src/claxondec/imp.rs index e7a59ea1..76ae65f1 100644 --- a/audio/claxon/src/claxondec/imp.rs +++ b/audio/claxon/src/claxondec/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::subclass::prelude::*; diff --git a/audio/claxon/src/claxondec/mod.rs b/audio/claxon/src/claxondec/mod.rs index 4e345f0c..9fc1aeae 100644 --- a/audio/claxon/src/claxondec/mod.rs +++ b/audio/claxon/src/claxondec/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/claxon/src/lib.rs b/audio/claxon/src/lib.rs index 1a0c8274..dff70387 100644 --- a/audio/claxon/src/lib.rs +++ b/audio/claxon/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/audio/claxon/tests/claxondec.rs b/audio/claxon/tests/claxondec.rs index 0cd5063f..307dd197 100644 --- a/audio/claxon/tests/claxondec.rs +++ b/audio/claxon/tests/claxondec.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::prelude::*; diff --git a/audio/lewton/Cargo.toml b/audio/lewton/Cargo.toml index 242ad698..3df098d4 100644 --- a/audio/lewton/Cargo.toml +++ b/audio/lewton/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-lewton" version = "0.9.0" authors = ["Sebastian Dröge <sebastian@centricular.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "lewton Vorbis Decoder Plugin" edition = "2021" rust-version = "1.57" diff --git a/audio/lewton/src/lewtondec/imp.rs b/audio/lewton/src/lewtondec/imp.rs index 92abc8b2..b0eb0504 100644 --- a/audio/lewton/src/lewtondec/imp.rs +++ b/audio/lewton/src/lewtondec/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::subclass::prelude::*; diff --git a/audio/lewton/src/lewtondec/mod.rs b/audio/lewton/src/lewtondec/mod.rs index 8db59b65..146f763a 100644 --- a/audio/lewton/src/lewtondec/mod.rs +++ b/audio/lewton/src/lewtondec/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/audio/lewton/src/lib.rs b/audio/lewton/src/lib.rs index 0e3b259d..6e49a70b 100644 --- a/audio/lewton/src/lib.rs +++ b/audio/lewton/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/audio/lewton/tests/lewtondec.rs b/audio/lewton/tests/lewtondec.rs index 559d9080..814c2b95 100644 --- a/audio/lewton/tests/lewtondec.rs +++ b/audio/lewton/tests/lewtondec.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::prelude::*; diff --git a/generic/file/Cargo.toml b/generic/file/Cargo.toml index f9e45ea1..a40e2d41 100644 --- a/generic/file/Cargo.toml +++ b/generic/file/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-file" version = "0.9.0" authors = ["Sebastian Dröge <sebastian@centricular.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Rust File Plugin" edition = "2021" rust-version = "1.57" diff --git a/generic/file/src/file_location.rs b/generic/file/src/file_location.rs index daad3b30..83fa75d8 100644 --- a/generic/file/src/file_location.rs +++ b/generic/file/src/file_location.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use url::Url; diff --git a/generic/file/src/filesink/imp.rs b/generic/file/src/filesink/imp.rs index d30d530c..44430375 100644 --- a/generic/file/src/filesink/imp.rs +++ b/generic/file/src/filesink/imp.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/generic/file/src/filesink/mod.rs b/generic/file/src/filesink/mod.rs index d814e2db..7d59a252 100644 --- a/generic/file/src/filesink/mod.rs +++ b/generic/file/src/filesink/mod.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/generic/file/src/filesrc/imp.rs b/generic/file/src/filesrc/imp.rs index 701ace4a..72a709b6 100644 --- a/generic/file/src/filesrc/imp.rs +++ b/generic/file/src/filesrc/imp.rs @@ -7,7 +7,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/generic/file/src/filesrc/mod.rs b/generic/file/src/filesrc/mod.rs index 97be7d59..15102e34 100644 --- a/generic/file/src/filesrc/mod.rs +++ b/generic/file/src/filesrc/mod.rs @@ -7,7 +7,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/generic/file/src/lib.rs b/generic/file/src/lib.rs index 9d97d628..cdcf505b 100644 --- a/generic/file/src/lib.rs +++ b/generic/file/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/net/reqwest/Cargo.toml b/net/reqwest/Cargo.toml index f4add9ea..0e240c0d 100644 --- a/net/reqwest/Cargo.toml +++ b/net/reqwest/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-reqwest" version = "0.9.0" authors = ["Sebastian Dröge <sebastian@centricular.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Rust HTTP Plugin" edition = "2021" rust-version = "1.57" diff --git a/net/reqwest/src/lib.rs b/net/reqwest/src/lib.rs index 34506915..ac421464 100644 --- a/net/reqwest/src/lib.rs +++ b/net/reqwest/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/net/reqwest/src/reqwesthttpsrc/imp.rs b/net/reqwest/src/reqwesthttpsrc/imp.rs index c5a63c74..ab9139f6 100644 --- a/net/reqwest/src/reqwesthttpsrc/imp.rs +++ b/net/reqwest/src/reqwesthttpsrc/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use std::sync::{Arc, Mutex}; use std::time::Duration; use std::u64; diff --git a/net/reqwest/src/reqwesthttpsrc/mod.rs b/net/reqwest/src/reqwesthttpsrc/mod.rs index 1729b7d4..1a263ec6 100644 --- a/net/reqwest/src/reqwesthttpsrc/mod.rs +++ b/net/reqwest/src/reqwesthttpsrc/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/net/reqwest/tests/reqwesthttpsrc.rs b/net/reqwest/tests/reqwesthttpsrc.rs index f6a69b07..5cde00d5 100644 --- a/net/reqwest/tests/reqwesthttpsrc.rs +++ b/net/reqwest/tests/reqwesthttpsrc.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::single_match)] diff --git a/tutorial/Cargo.toml b/tutorial/Cargo.toml index c94f980a..5103ea71 100644 --- a/tutorial/Cargo.toml +++ b/tutorial/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-tutorial" version = "0.9.0" authors = ["Sebastian Dröge <sebastian@centricular.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" rust-version = "1.57" description = "Rust Tutorial Plugin" diff --git a/tutorial/src/identity/imp.rs b/tutorial/src/identity/imp.rs index 1e5c72e8..e166a0d1 100644 --- a/tutorial/src/identity/imp.rs +++ b/tutorial/src/identity/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/identity/mod.rs b/tutorial/src/identity/mod.rs index 19bfd861..6ff03199 100644 --- a/tutorial/src/identity/mod.rs +++ b/tutorial/src/identity/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/lib.rs b/tutorial/src/lib.rs index 9a4a8eeb..9f7998ef 100644 --- a/tutorial/src/lib.rs +++ b/tutorial/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/tutorial/src/progressbin/imp.rs b/tutorial/src/progressbin/imp.rs index c65eedbc..e8dbbc77 100644 --- a/tutorial/src/progressbin/imp.rs +++ b/tutorial/src/progressbin/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/progressbin/mod.rs b/tutorial/src/progressbin/mod.rs index 52efa9a3..5cb4dcdd 100644 --- a/tutorial/src/progressbin/mod.rs +++ b/tutorial/src/progressbin/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/rgb2gray/imp.rs b/tutorial/src/rgb2gray/imp.rs index 2da282c5..5ff2cd61 100644 --- a/tutorial/src/rgb2gray/imp.rs +++ b/tutorial/src/rgb2gray/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/rgb2gray/mod.rs b/tutorial/src/rgb2gray/mod.rs index 345cc519..45acdd64 100644 --- a/tutorial/src/rgb2gray/mod.rs +++ b/tutorial/src/rgb2gray/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/sinesrc/imp.rs b/tutorial/src/sinesrc/imp.rs index ea3897a1..e412a8f9 100644 --- a/tutorial/src/sinesrc/imp.rs +++ b/tutorial/src/sinesrc/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/sinesrc/mod.rs b/tutorial/src/sinesrc/mod.rs index a6dc81ee..bb95ff41 100644 --- a/tutorial/src/sinesrc/mod.rs +++ b/tutorial/src/sinesrc/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/tutorial-1.md b/tutorial/tutorial-1.md index a190e275..b60c6211 100644 --- a/tutorial/tutorial-1.md +++ b/tutorial/tutorial-1.md @@ -35,7 +35,7 @@ name = "gst-plugin-tutorial" version = "0.1.0" authors = ["Sebastian Dröge <sebastian@centricular.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" description = "Rust Tutorial Plugin" diff --git a/video/cdg/Cargo.toml b/video/cdg/Cargo.toml index b572c122..eb4c0f54 100644 --- a/video/cdg/Cargo.toml +++ b/video/cdg/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-cdg" version = "0.9.0" authors = ["Guillaume Desmottes <guillaume.desmottes@collabora.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "CDG Plugin" edition = "2021" rust-version = "1.57" diff --git a/video/cdg/src/cdgdec/imp.rs b/video/cdg/src/cdgdec/imp.rs index 76d7f730..5e4f3cc3 100644 --- a/video/cdg/src/cdgdec/imp.rs +++ b/video/cdg/src/cdgdec/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::subclass::prelude::*; diff --git a/video/cdg/src/cdgdec/mod.rs b/video/cdg/src/cdgdec/mod.rs index 0f824779..85b5fe4e 100644 --- a/video/cdg/src/cdgdec/mod.rs +++ b/video/cdg/src/cdgdec/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/cdg/src/cdgparse/imp.rs b/video/cdg/src/cdgparse/imp.rs index e9bf747b..f4d04a68 100644 --- a/video/cdg/src/cdgparse/imp.rs +++ b/video/cdg/src/cdgparse/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::format::Bytes; use gst::glib; diff --git a/video/cdg/src/cdgparse/mod.rs b/video/cdg/src/cdgparse/mod.rs index ec2b1254..43794b55 100644 --- a/video/cdg/src/cdgparse/mod.rs +++ b/video/cdg/src/cdgparse/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/cdg/src/constants.rs b/video/cdg/src/constants.rs index 69b8cf13..6f11f49c 100644 --- a/video/cdg/src/constants.rs +++ b/video/cdg/src/constants.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 pub(crate) const CDG_PACKET_SIZE: i32 = 24; diff --git a/video/cdg/src/lib.rs b/video/cdg/src/lib.rs index 78a70753..bbf9bcfd 100644 --- a/video/cdg/src/lib.rs +++ b/video/cdg/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/video/cdg/src/typefind.rs b/video/cdg/src/typefind.rs index 2802c970..feff41ce 100644 --- a/video/cdg/src/typefind.rs +++ b/video/cdg/src/typefind.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; diff --git a/video/cdg/tests/cdgdec.rs b/video/cdg/tests/cdgdec.rs index d5a9ca66..750ab359 100644 --- a/video/cdg/tests/cdgdec.rs +++ b/video/cdg/tests/cdgdec.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::prelude::*; use std::path::PathBuf; diff --git a/video/dav1d/Cargo.toml b/video/dav1d/Cargo.toml index 3b16f90c..2b6c84b4 100644 --- a/video/dav1d/Cargo.toml +++ b/video/dav1d/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Philippe Normand <philn@igalia.com>"] edition = "2021" rust-version = "1.57" repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Dav1d Plugin" [dependencies] diff --git a/video/dav1d/src/dav1ddec/imp.rs b/video/dav1d/src/dav1ddec/imp.rs index 789b50bf..8331ee43 100644 --- a/video/dav1d/src/dav1ddec/imp.rs +++ b/video/dav1d/src/dav1ddec/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/dav1d/src/dav1ddec/mod.rs b/video/dav1d/src/dav1ddec/mod.rs index f714b023..b439c693 100644 --- a/video/dav1d/src/dav1ddec/mod.rs +++ b/video/dav1d/src/dav1ddec/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/dav1d/src/lib.rs b/video/dav1d/src/lib.rs index ae63f523..a63ee025 100644 --- a/video/dav1d/src/lib.rs +++ b/video/dav1d/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/video/ffv1/Cargo.toml b/video/ffv1/Cargo.toml index f5206458..29948e30 100644 --- a/video/ffv1/Cargo.toml +++ b/video/ffv1/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-ffv1" version = "0.9.0" authors = ["Arun Raghavan <arun@asymptotic.io>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "FFV1 Decoder Plugin" edition = "2021" rust-version = "1.57" diff --git a/video/ffv1/src/ffv1dec/imp.rs b/video/ffv1/src/ffv1dec/imp.rs index 4b813e75..9fdcbaaa 100644 --- a/video/ffv1/src/ffv1dec/imp.rs +++ b/video/ffv1/src/ffv1dec/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use ffv1::constants::{RGB, YCBCR}; use ffv1::decoder::{Decoder, Frame}; diff --git a/video/ffv1/src/ffv1dec/mod.rs b/video/ffv1/src/ffv1dec/mod.rs index 4a941b1d..52ba3425 100644 --- a/video/ffv1/src/ffv1dec/mod.rs +++ b/video/ffv1/src/ffv1dec/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/ffv1/src/lib.rs b/video/ffv1/src/lib.rs index 03572c2d..2fb0e972 100644 --- a/video/ffv1/src/lib.rs +++ b/video/ffv1/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] mod ffv1dec; diff --git a/video/ffv1/tests/ffv1dec.rs b/video/ffv1/tests/ffv1dec.rs index a431ff4c..dd5b9c30 100644 --- a/video/ffv1/tests/ffv1dec.rs +++ b/video/ffv1/tests/ffv1dec.rs @@ -7,7 +7,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/flavors/Cargo.toml b/video/flavors/Cargo.toml index 96e7f9ce..aa62f8e9 100644 --- a/video/flavors/Cargo.toml +++ b/video/flavors/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-flavors" version = "0.9.0" authors = ["Sebastian Dröge <sebastian@centricular.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" rust-version = "1.57" description = "Rust FLV Plugin" diff --git a/video/flavors/src/bytes.rs b/video/flavors/src/bytes.rs index f02b8166..02263993 100644 --- a/video/flavors/src/bytes.rs +++ b/video/flavors/src/bytes.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 pub use byteorder::{BigEndian, LittleEndian, ReadBytesExt, WriteBytesExt}; use std::io; diff --git a/video/flavors/src/flvdemux/imp.rs b/video/flavors/src/flvdemux/imp.rs index cf4eee7b..36d010a3 100644 --- a/video/flavors/src/flvdemux/imp.rs +++ b/video/flavors/src/flvdemux/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use std::cmp; use std::sync::Mutex; diff --git a/video/flavors/src/flvdemux/mod.rs b/video/flavors/src/flvdemux/mod.rs index 9ee44eda..aa311bdf 100644 --- a/video/flavors/src/flvdemux/mod.rs +++ b/video/flavors/src/flvdemux/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/flavors/src/lib.rs b/video/flavors/src/lib.rs index 70d0a498..95bf6501 100644 --- a/video/flavors/src/lib.rs +++ b/video/flavors/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/video/gif/Cargo.toml b/video/gif/Cargo.toml index 5d9c354f..616b3dbe 100644 --- a/video/gif/Cargo.toml +++ b/video/gif/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-gif" version = "0.9.0" authors = ["Markus Ebner <info@ebner-markus.de>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" rust-version = "1.57" description = "GStreamer GIF plugin" diff --git a/video/gif/examples/testvideosrc2gif.rs b/video/gif/examples/testvideosrc2gif.rs index 106f4ffa..4e7848b2 100644 --- a/video/gif/examples/testvideosrc2gif.rs +++ b/video/gif/examples/testvideosrc2gif.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::prelude::*; diff --git a/video/gif/src/gifenc/imp.rs b/video/gif/src/gifenc/imp.rs index 4c863a7e..f5876b92 100644 --- a/video/gif/src/gifenc/imp.rs +++ b/video/gif/src/gifenc/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use atomic_refcell::AtomicRefCell; use gst::glib; diff --git a/video/gif/src/gifenc/mod.rs b/video/gif/src/gifenc/mod.rs index 3a5ed0ce..2e6b7de3 100644 --- a/video/gif/src/gifenc/mod.rs +++ b/video/gif/src/gifenc/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/gif/src/lib.rs b/video/gif/src/lib.rs index 25cf64df..0ae16abf 100644 --- a/video/gif/src/lib.rs +++ b/video/gif/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/video/gif/tests/gifenc.rs b/video/gif/tests/gifenc.rs index 525b3e46..8d9ce9a6 100644 --- a/video/gif/tests/gifenc.rs +++ b/video/gif/tests/gifenc.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 fn init() { use std::sync::Once; diff --git a/video/hsv/Cargo.toml b/video/hsv/Cargo.toml index 99406ef8..9e4cd69f 100644 --- a/video/hsv/Cargo.toml +++ b/video/hsv/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-hsv" version = "0.9.0" authors = ["Julien Bardagi <julien.bardagi@gmail.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" rust-version = "1.57" description = "HSV manipulation elements, written in Rust" diff --git a/video/hsv/src/hsvdetector/imp.rs b/video/hsv/src/hsvdetector/imp.rs index 5643dba1..03f3b17d 100644 --- a/video/hsv/src/hsvdetector/imp.rs +++ b/video/hsv/src/hsvdetector/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/hsv/src/hsvdetector/mod.rs b/video/hsv/src/hsvdetector/mod.rs index cc1ff36d..2c750964 100644 --- a/video/hsv/src/hsvdetector/mod.rs +++ b/video/hsv/src/hsvdetector/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/hsv/src/hsvfilter/imp.rs b/video/hsv/src/hsvfilter/imp.rs index e7650e99..c0a8228f 100644 --- a/video/hsv/src/hsvfilter/imp.rs +++ b/video/hsv/src/hsvfilter/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/hsv/src/hsvfilter/mod.rs b/video/hsv/src/hsvfilter/mod.rs index 8f054cdb..8c51ff42 100644 --- a/video/hsv/src/hsvfilter/mod.rs +++ b/video/hsv/src/hsvfilter/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/hsv/src/hsvutils.rs b/video/hsv/src/hsvutils.rs index 5577e591..c1d7ad4c 100644 --- a/video/hsv/src/hsvutils.rs +++ b/video/hsv/src/hsvutils.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 // Reference used for implementation: https://en.wikipedia.org/wiki/HSL_and_HSV diff --git a/video/hsv/src/lib.rs b/video/hsv/src/lib.rs index 7b56aefc..f2ea26b3 100644 --- a/video/hsv/src/lib.rs +++ b/video/hsv/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/video/rav1e/Cargo.toml b/video/rav1e/Cargo.toml index 6e5e44c6..5414777d 100644 --- a/video/rav1e/Cargo.toml +++ b/video/rav1e/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-rav1e" version = "0.9.0" authors = ["Sebastian Dröge <sebastian@centricular.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "rav1e AV1 Encoder Plugin" edition = "2021" rust-version = "1.57" diff --git a/video/rav1e/src/lib.rs b/video/rav1e/src/lib.rs index 6e5b42c8..bfc8bf9d 100644 --- a/video/rav1e/src/lib.rs +++ b/video/rav1e/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/video/rav1e/src/rav1enc/imp.rs b/video/rav1e/src/rav1enc/imp.rs index 29eb6683..fcb38651 100644 --- a/video/rav1e/src/rav1enc/imp.rs +++ b/video/rav1e/src/rav1enc/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use atomic_refcell::AtomicRefCell; use gst::glib; diff --git a/video/rav1e/src/rav1enc/mod.rs b/video/rav1e/src/rav1enc/mod.rs index 26a16798..9349c1dd 100644 --- a/video/rav1e/src/rav1enc/mod.rs +++ b/video/rav1e/src/rav1enc/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/rav1e/tests/rav1enc.rs b/video/rav1e/tests/rav1enc.rs index 85619a05..13d8a063 100644 --- a/video/rav1e/tests/rav1enc.rs +++ b/video/rav1e/tests/rav1enc.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::prelude::*; diff --git a/video/rspng/Cargo.toml b/video/rspng/Cargo.toml index c325be70..fb985a96 100644 --- a/video/rspng/Cargo.toml +++ b/video/rspng/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-rspng" version = "0.9.0" authors = ["Natanael Mojica <neithanmo@gmail.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" rust-version = "1.57" description = "An PNG encoder/decoder written in pure Rust" diff --git a/video/rspng/examples/pngenc.rs b/video/rspng/examples/pngenc.rs index d543b912..0ed81975 100644 --- a/video/rspng/examples/pngenc.rs +++ b/video/rspng/examples/pngenc.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::prelude::*; diff --git a/video/rspng/src/lib.rs b/video/rspng/src/lib.rs index 38040e41..d05a4d73 100644 --- a/video/rspng/src/lib.rs +++ b/video/rspng/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/video/rspng/src/pngenc/imp.rs b/video/rspng/src/pngenc/imp.rs index 5b54972b..8d00bcf3 100644 --- a/video/rspng/src/pngenc/imp.rs +++ b/video/rspng/src/pngenc/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use std::{io, io::Write, sync::Arc}; diff --git a/video/rspng/src/pngenc/mod.rs b/video/rspng/src/pngenc/mod.rs index 1934e51d..debedaa2 100644 --- a/video/rspng/src/pngenc/mod.rs +++ b/video/rspng/src/pngenc/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/video/rspng/tests/pngenc.rs b/video/rspng/tests/pngenc.rs index ace393d2..bcac6e1f 100644 --- a/video/rspng/tests/pngenc.rs +++ b/video/rspng/tests/pngenc.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 fn init() { use std::sync::Once; |