Merge branch 'master' into pr6360

Manual changes done:
  * Merged the interface-changes under the already master'd changes.
  * Moved the hwdec-related option changes to video/decode/vd_lavc.c.

4 files changed, 9 insertions, 11 deletions

diff --git a/player/command.c b/player/command.c
index 4d0fbefc34..0dc9e9a8b9 100644
--- a/player/command.c
+++ b/player/command.c
@@ -4052,6 +4052,7 @@ static bool is_property_set(int action, void *val)
     case M_PROPERTY_SWITCH:
     case M_PROPERTY_SET_STRING:
     case M_PROPERTY_SET_NODE:
+    case M_PROPERTY_MULTIPLY:
         return true;
     case M_PROPERTY_KEY_ACTION: {
         struct m_property_action_arg *key = val;
diff --git a/player/loadfile.c b/player/loadfile.c
index 4dff4c710c..f55dd29f34 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -752,7 +752,7 @@ int mp_add_external_file(struct MPContext *mpctx, char *filename,
     if (!demuxer)
         goto err_out;
 
-    if (opts->rebase_start_time)
+    if (filter != STREAM_SUB && opts->rebase_start_time)
         demux_set_ts_offset(demuxer, -demuxer->start_time);
 
     bool has_any = false;
diff --git a/player/lua/defaults.lua b/player/lua/defaults.lua
index 1da6420182..523b649b8c 100644
--- a/player/lua/defaults.lua
+++ b/player/lua/defaults.lua
@@ -476,12 +476,9 @@ function mp.dispatch_events(allow_wait)
     while mp.keep_running do
         local wait = 0
         if not more_events then
-            wait = process_timers()
-            if wait == nil then
-                for _, handler in ipairs(idle_handlers) do
-                    handler()
-                end
-                wait = 1e20 -- infinity for all practical purposes
+            wait = process_timers() or 1e20 -- infinity for all practical purposes
+            for _, handler in ipairs(idle_handlers) do
+                handler()
             end
             -- Resume playloop - important especially if an error happened while
             -- suspended, and the error was handled, but no resume was done.
diff --git a/player/lua/stats.lua b/player/lua/stats.lua
index 6272aab9c2..db3df01c6d 100644
--- a/player/lua/stats.lua
+++ b/player/lua/stats.lua
@@ -430,7 +430,8 @@ local function add_file(s)
         append_property(s, "media-title", {prefix="Title:"})
     end
 
-    append_property(s, "file-format", {prefix="Format/Protocol:"})
+    local fs = append_property(s, "file-size", {prefix="Size:"})
+    append_property(s, "file-format", {prefix="Format/Protocol:", nl=fs and "" or o.nl})
 
     local ch_index = mp.get_property_number("chapter")
     if ch_index and ch_index >= 0 then
@@ -457,7 +458,6 @@ local function add_file(s)
                    indent=o.prefix_sep, no_prefix_markup=true})
         end
     end
-    append_property(s, "file-size", {prefix="Size:"})
 end
 
 
@@ -536,9 +536,9 @@ local function add_audio(s)
 
     append(s, "", {prefix=o.nl .. o.nl .. "Audio:", nl="", indent=""})
     append_property(s, "audio-codec", {prefix_sep="", nl="", indent=""})
-    append(s, r["format"], {prefix="Format:"})
+    local cc = append(s, r["channel-count"], {prefix="Channels:"})
+    append(s, r["format"], {prefix="Format:", nl=cc and "" or o.nl})
     append(s, r["samplerate"], {prefix="Sample Rate:", suffix=" Hz"})
-    append(s, r["channel-count"], {prefix="Channels:"})
     append_property(s, "packet-audio-bitrate", {prefix="Bitrate:", suffix=" kbps"})
     append_filters(s, "af", "Filters:")
 end