Fix #11930, #11693

(cherry picked from commit bf9b995528941436fbdfad6e60ce7af76f20ea2e)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>