Bugfix and code cleanup for Video Recorder.
Authored by: brunoherbelin 2018-06-01
Parent: [r1725]
Child: [r1727]