summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKacper Michajłow <kasper93@gmail.com>2023-09-01 03:15:10 +0200
committerNiklas Haas <github-daiK1o@haasn.dev>2023-10-14 12:30:46 +0200
commit72536cce62f27eb601037d589cd68be9a67762e5 (patch)
tree09490441f826132094009ff9b787b9540a0c5ced
parentc4f0b24debc898a617870e827ec0005230632ef1 (diff)
downloadmpv-72536cce62f27eb601037d589cd68be9a67762e5.tar.bz2
mpv-72536cce62f27eb601037d589cd68be9a67762e5.tar.xz
f_decoder_wrapper: change video-codec to show description or name
Not both of them. Formating it as `<name> (<desc>)` produced arguably silly string like `hevc (HEVC (High Efficiency Video Coding))`. Unpack this to show only description if available or name otherwise. Produces way nicer results in stats.lua and similar places where this name is printed.
-rw-r--r--DOCS/interface-changes.rst1
-rw-r--r--filters/f_decoder_wrapper.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index d398ab7987..2dcf17c777 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -99,6 +99,7 @@ Interface changes
- deprecate `--demuxer-cue-codepage` in favor of `--metadata-codepage`
- change the default of `metadata-codepage` to `auto`
- add `playlist-next-playlist` and `playlist-prev-playlist` commands
+ - change `video-codec` to show description or name, not both
--- mpv 0.36.0 ---
- add `--target-contrast`
- Target luminance value is now also applied when ICC profile is used.
diff --git a/filters/f_decoder_wrapper.c b/filters/f_decoder_wrapper.c
index 7e51c57a92..433ba19ec7 100644
--- a/filters/f_decoder_wrapper.c
+++ b/filters/f_decoder_wrapper.c
@@ -450,8 +450,8 @@ static bool reinit_decoder(struct priv *p)
p->decoder = driver->create(p->decf, p->codec, sel->decoder);
if (p->decoder) {
pthread_mutex_lock(&p->cache_lock);
- p->decoder_desc =
- talloc_asprintf(p, "%s (%s)", sel->decoder, sel->desc);
+ const char *d = sel->desc && sel->desc[0] ? sel->desc : sel->decoder;
+ p->decoder_desc = talloc_strdup(p, d);
MP_VERBOSE(p, "Selected codec: %s\n", p->decoder_desc);
pthread_mutex_unlock(&p->cache_lock);
break;