This could use a bit more testing than a single video
(cherry picked from commit 64e30497fa764f680c2b235757e49f6c83b85028)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>