Merge branch 'video' into develop
Listen to ffmpeg errors