Close #11721 #11761

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