Fix #7884 and #7887 by implementing the first proposition.
(cherry picked from commit 6f8e8326ef82029d868d3c4729c9fd64e41a06f2)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>