diff --git a/NEWS.md b/NEWS.md
index b1713eeff..8670c93e0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -47,6 +47,13 @@
sometimes dropped, resulting in broken video at the point where video is
appended. Fixes #3479.
+## Other changes
+
+* AVC & HEVC dumper development tool: the tool has been renamed from
+ `xvc_dump` to `xyzvc_dump` as `xvc` is an abbreviation for an existing video
+ codec (Extreme Video Coding), and the tool has nothing to do with that
+ codec.
+
# Version 80.0 "Roundabout" 2023-10-29
diff --git a/Rakefile b/Rakefile
index 57521a2c6..eb964f983 100644
--- a/Rakefile
+++ b/Rakefile
@@ -85,7 +85,7 @@ def setup_globals
$programs = %w{mkvmerge mkvinfo mkvextract mkvpropedit}
$programs << "mkvtoolnix" if $build_mkvtoolnix
$programs << "mkvtoolnix-gui" if $build_mkvtoolnix_gui
- $tools = %w{ac3parser base64tool bluray_dump checksum diracparser dts_dump ebml_validator hevcc_dump pgs_dump vc1parser xvc_dump}
+ $tools = %w{ac3parser base64tool bluray_dump checksum diracparser dts_dump ebml_validator hevcc_dump pgs_dump vc1parser xyzvc_dump}
$application_subdirs = { "mkvtoolnix-gui" => "mkvtoolnix-gui/", "mkvtoolnix" => "mkvtoolnix/" }
$applications = $programs.map { |name| "src/#{$application_subdirs[name]}#{name}" + c(:EXEEXT) }
diff --git a/doc/man/mkvtoolnix.xml b/doc/man/mkvtoolnix.xml
index 7dc606bff..a20fca497 100644
--- a/doc/man/mkvtoolnix.xml
+++ b/doc/man/mkvtoolnix.xml
@@ -101,7 +101,7 @@
- xvc_dump
+ xyzvc_dump
diff --git a/packaging/centos-fedora-opensuse/mkvtoolnix.spec b/packaging/centos-fedora-opensuse/mkvtoolnix.spec
index cc5cf8a16..8a157c45a 100644
--- a/packaging/centos-fedora-opensuse/mkvtoolnix.spec
+++ b/packaging/centos-fedora-opensuse/mkvtoolnix.spec
@@ -142,7 +142,7 @@ if test `lsb_release -is` = Fedora; then
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.bunkus.mkvtoolnix-gui.appdata.xml
fi
-install -pm 755 src/tools/{bluray_dump,ebml_validator,hevcc_dump,xvc_dump} $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 src/tools/{bluray_dump,ebml_validator,hevcc_dump,xyzvc_dump} $RPM_BUILD_ROOT%{_bindir}
%find_lang %{name}
%find_lang mkvextract --with-man
@@ -185,7 +185,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || true
%{_bindir}/mkvinfo
%{_bindir}/mkvmerge
%{_bindir}/mkvpropedit
-%{_bindir}/xvc_dump
+%{_bindir}/xyzvc_dump
%{_mandir}/man1/mkvextract.1*
%{_mandir}/man1/mkvinfo.1*
%{_mandir}/man1/mkvmerge.1*
diff --git a/packaging/debian/mkvtoolnix.install b/packaging/debian/mkvtoolnix.install
index bbb22f2ba..627dc6077 100644
--- a/packaging/debian/mkvtoolnix.install
+++ b/packaging/debian/mkvtoolnix.install
@@ -5,7 +5,7 @@ usr/bin/mkvextract
usr/bin/mkvinfo
usr/bin/mkvmerge
usr/bin/mkvpropedit
-usr/bin/xvc_dump
+usr/bin/xyzvc_dump
usr/share/icons/hicolor/*/apps/mkvpropedit.png
usr/share/icons/hicolor/*/apps/mkvextract.png
usr/share/icons/hicolor/*/apps/mkvinfo.png
diff --git a/packaging/debian/rules.erb b/packaging/debian/rules.erb
index f9cead220..99c675837 100755
--- a/packaging/debian/rules.erb
+++ b/packaging/debian/rules.erb
@@ -56,7 +56,7 @@ endif
override_dh_install:
./drake install DESTDIR=$(CURDIR)/debian/tmp
- install -m 755 -t $(CURDIR)/debian/tmp/usr/bin $(patsubst %,src/tools/%,bluray_dump ebml_validator hevcc_dump xvc_dump)
+ install -m 755 -t $(CURDIR)/debian/tmp/usr/bin $(patsubst %,src/tools/%,bluray_dump ebml_validator hevcc_dump xyzvc_dump)
dh_install -Xorg.bunkus.mkvtoolnix-gui.xml
dh_missing --fail-missing -Xorg.bunkus.mkvtoolnix-gui.xml
diff --git a/packaging/windows/msix/generate_assets.sh b/packaging/windows/msix/generate_assets.sh
index 4b455352f..2faa5da4b 100755
--- a/packaging/windows/msix/generate_assets.sh
+++ b/packaging/windows/msix/generate_assets.sh
@@ -54,7 +54,7 @@ for file in *.scale-100.png; do
done
# dir=../../../../share/icons/windows/msix
-# for program in mkvmerge mkvinfo mkvextract mkvpropedit bluray_dump ebml_validator hevcc_dump xvc_dump; do
+# for program in mkvmerge mkvinfo mkvextract mkvpropedit bluray_dump ebml_validator hevcc_dump xyzvc_dump; do
# for size in 44 150; do
# convert ${dir}/${program}.xcf -background transparent -layers flatten -size ${size}x${size} Square${size}x${size}Logo-${program}.png
# done
diff --git a/packaging/windows/populate_installer_dir.sh b/packaging/windows/populate_installer_dir.sh
index bf0317a70..f2d1972f7 100755
--- a/packaging/windows/populate_installer_dir.sh
+++ b/packaging/windows/populate_installer_dir.sh
@@ -133,7 +133,7 @@ function copy_files {
cp share/icons/windows/mkvtoolnix-gui.ico ${tgt_dir}/installer/
mkdir ${tgt_dir}/tools
- cp src/tools/{bluray_dump,ebml_validator,hevcc_dump,xvc_dump}.exe ${tgt_dir}/tools/
+ cp src/tools/{bluray_dump,ebml_validator,hevcc_dump,xyzvc_dump}.exe ${tgt_dir}/tools/
cp src/mkvtoolnix-gui/qt_resources.rcc ${tgt_dir}/data/
cp share/sounds/* ${tgt_dir}/data/sounds/
diff --git a/src/mkvtoolnix/mkvtoolnix.cpp b/src/mkvtoolnix/mkvtoolnix.cpp
index 3109ccb52..be055f46e 100644
--- a/src/mkvtoolnix/mkvtoolnix.cpp
+++ b/src/mkvtoolnix/mkvtoolnix.cpp
@@ -43,7 +43,7 @@ determine_program(std::vector &args) {
return program;
QRegularExpression main_name_re{"^(?:mkv)?(merge|info|extract|propedit|toolnix-gui)(?:\\.exe)?$"};
- QRegularExpression tool_name_re{"^(bluray_dump|ebml_validator|hevcc_dump|xvc_dump)(?:\\.exe)?$"};
+ QRegularExpression tool_name_re{"^(bluray_dump|ebml_validator|hevcc_dump|xyzvc_dump)(?:\\.exe)?$"};
auto matches = main_name_re.match(Q(args[0]));
diff --git a/src/tools/hevc_extract_nalus.rb b/src/tools/hevc_extract_nalus.rb
index c42ee7a99..7d1f39ba6 100755
--- a/src/tools/hevc_extract_nalus.rb
+++ b/src/tools/hevc_extract_nalus.rb
@@ -10,7 +10,7 @@ end
nalus = []
-`xvc_dump #{Shellwords.escape(ARGV[0])}`.
+`xyzvc_dump #{Shellwords.escape(ARGV[0])}`.
split(%r{\n+}).
each do |line|
diff --git a/src/tools/xvc_dump.cpp b/src/tools/xyzvc_dump.cpp
similarity index 97%
rename from src/tools/xvc_dump.cpp
rename to src/tools/xyzvc_dump.cpp
index cd61cd97b..b39267caa 100644
--- a/src/tools/xvc_dump.cpp
+++ b/src/tools/xyzvc_dump.cpp
@@ -1,5 +1,5 @@
/*
- xvc_dump - A tool for dumping HEVC structures
+ xyzvc_dump - A tool for dumping HEVC structures
Distributed under the GPL v2
see the file COPYING for details
@@ -43,7 +43,7 @@ static std::unique_ptr s_parser;
static void
setup_help() {
- mtx::cli::g_usage_text = "xvc_dump [options] input_file_name\n"
+ mtx::cli::g_usage_text = "xyzvc_dump [options] input_file_name\n"
"\n"
"General options:\n"
"\n"
@@ -135,14 +135,14 @@ parse_args(std::vector &args) {
s_codec_type = codec_type_e::hevc;
else
- mxerror("The file type could not be derived from the file name's extension. Please specify the corresponding command line option (see 'xvc_dump --help').\n");
+ mxerror("The file type could not be derived from the file name's extension. Please specify the corresponding command line option (see 'xyzvc_dump --help').\n");
}
if (s_framing_type == framing_type_e::unknown) {
s_framing_type = detect_framing_type(file_name);
if (s_framing_type == framing_type_e::unknown)
- mxerror("The framing type could not be derived from the file's content. Please specify the corresponding command line option (see 'xvc_dump --help').\n");
+ mxerror("The framing type could not be derived from the file's content. Please specify the corresponding command line option (see 'xyzvc_dump --help').\n");
}
return file_name;
@@ -318,7 +318,7 @@ parse_file_iso_14496_15(std::string const &file_name) {
int
main(int argc,
char **argv) {
- mtx_common_init("xvc_dump", argv[0]);
+ mtx_common_init("xyzvc_dump", argv[0]);
setup_help();
auto args = mtx::cli::args_in_utf8(argc, argv);