From: Kostya Shishkov Date: Tue, 9 Jun 2026 18:39:10 +0000 (+0200) Subject: use common definition for forcing stream tag option X-Git-Url: https://git.nihav.org/?a=commitdiff_plain;h=dcd360ff48d4475e8c10947d12db3753342ff465;p=nihav.git use common definition for forcing stream tag option --- diff --git a/nihav-commonfmt/src/muxers/avi.rs b/nihav-commonfmt/src/muxers/avi.rs index b38e817..403a252 100644 --- a/nihav-commonfmt/src/muxers/avi.rs +++ b/nihav-commonfmt/src/muxers/avi.rs @@ -588,7 +588,7 @@ impl<'a> MuxCore<'a> for AVIMuxer<'a> { const MUXER_OPTS: &[NAOptionDefinition] = &[ NAOptionDefinition { - name: "stream_tag", description: "forced stream tag(s) in 'streamNtagHHHHHHHH' format", + name: FORCE_STREAM_TAG_OPTION, description: FORCE_STREAM_TAG_OPTION_DESC, opt_type: NAOptionDefinitionType::String(None) }, ]; @@ -632,7 +632,7 @@ impl<'a> NAOptionHandler for AVIMuxer<'a> { fn get_supported_options(&self) -> &[NAOptionDefinition] { MUXER_OPTS } fn set_options(&mut self, options: &[NAOption]) { for opt in options.iter() { - if let NAOption { name: "stream_tag" , value: NAValue::String(ref stag) } = opt { + if let NAOption { name: FORCE_STREAM_TAG_OPTION , value: NAValue::String(ref stag) } = opt { if let Some(new_tag) = parse_tag(stag.as_bytes()) { let mut found = false; for tag in self.forced_tags.iter_mut() { diff --git a/nihav-core/src/options.rs b/nihav-core/src/options.rs index 32baa64..4b7c5e0 100644 --- a/nihav-core/src/options.rs +++ b/nihav-core/src/options.rs @@ -31,6 +31,11 @@ pub const FORCE_SEEK_OPTION: &str = "force_seek"; /// Common description for forcing seek outside defined seekpoints. pub const FORCE_SEEK_OPTION_DESC: &str = "Allow seeking to arbitrary positions"; +/// Common name for forcing stream tag. +pub const FORCE_STREAM_TAG_OPTION: &str = "stream_tag"; +/// Common description for forcing stream tag. +pub const FORCE_STREAM_TAG_OPTION_DESC: &str = "Forced stream tag(s) in 'streamNtagHHHH' format"; + /// A list specifying option parsing and validating errors. #[derive(Clone,Copy,Debug,PartialEq)] pub enum OptionError {