introduce --iformat as an alias for --input-format

[nihav-encoder.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 977eb38cdfae2304f6e258085ad32f603eaf2b27..6878a878e28a54368d7ab921b2a548df15ca1423 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -627,7 +627,8 @@ impl Transcoder {
                             }
                         },
                         (NACodecTypeInfo::Audio(sainfo), NACodecTypeInfo::Audio(dainfo)) => {
-                            if sainfo == dainfo {
+                            let icodec = istr.get_info().get_name();
+                            if (sainfo == dainfo) && (icodec != "pcm" || oopts.enc_name.as_str() == "pcm") {
                                 OutputConvert::None
                             } else {
                                 let dchmap = match dainfo.channels {
@@ -1205,6 +1206,10 @@ fn main() {
                         println!("invalid output stream option syntax");
                         return;
                     }
+                } else if args[arg_idx].starts_with("--iformat") {
+                    let id = parse_id!(&args[arg_idx][9..], "input format", transcoder.input_fmt.len());
+                    next_arg!(args, arg_idx);
+                    transcoder.input_fmt[id] = Some(args[arg_idx].clone());
                 } else if args[arg_idx].starts_with("--input-format") {
                     let id = parse_id!(&args[arg_idx][14..], "input format", transcoder.input_fmt.len());
                     next_arg!(args, arg_idx);