From fd1eb33ff4f9c3b24a9139dcf350771162780b2c Mon Sep 17 00:00:00 2001 From: rigaya Date: Sun, 22 Jan 2023 17:56:42 +0900 Subject: [PATCH] =?UTF-8?q?=E8=A8=80=E8=AA=9E=E3=81=AB=E3=82=88=E3=82=8B--?= =?UTF-8?q?audio-copy=E3=81=AE=E6=8C=87=E5=AE=9A=E3=81=8C=E9=81=A9?= =?UTF-8?q?=E5=88=87=E3=81=AB=E5=8B=95=E4=BD=9C=E3=81=97=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E5=95=8F=E9=A1=8C=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VCECore/rgy_cmd.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/VCECore/rgy_cmd.cpp b/VCECore/rgy_cmd.cpp index 475a3cad..7ae39d18 100644 --- a/VCECore/rgy_cmd.cpp +++ b/VCECore/rgy_cmd.cpp @@ -3710,15 +3710,17 @@ int parse_one_common_option(const TCHAR *option_name, const TCHAR *strInput[], i auto trackListStr = split(strInput[i], _T(",")); for (auto str : trackListStr) { int iTrack = 0; - if (1 == _stscanf(str.c_str(), _T("%d"), &iTrack) || iTrack < 1) { - trackSet.insert(std::make_pair(iTrack, "")); - } else if (rgy_lang_exist(tchar_to_string(str))) { - trackSet.insert(std::make_pair(TRACK_SELECT_BY_LANG, tchar_to_string(str))); - } else if (avcodec_exists(tchar_to_string(str), AVMEDIA_TYPE_AUDIO)) { - trackSet.insert(std::make_pair(TRACK_SELECT_BY_CODEC, tchar_to_string(str))); + if (1 != _stscanf(str.c_str(), _T("%d"), &iTrack) || iTrack < 1) { + if (rgy_lang_exist(tchar_to_string(str))) { + trackSet.insert(std::make_pair(TRACK_SELECT_BY_LANG, tchar_to_string(str))); + } else if (avcodec_exists(tchar_to_string(str), AVMEDIA_TYPE_AUDIO)) { + trackSet.insert(std::make_pair(TRACK_SELECT_BY_CODEC, tchar_to_string(str))); + } else { + print_cmd_error_invalid_value(option_name, strInput[i]); + return 1; + } } else { - print_cmd_error_invalid_value(option_name, strInput[i]); - return 1; + trackSet.insert(std::make_pair(iTrack, "")); } } } else {