Merge branch 'bob-devel' into 'master'

[bob-devel] Update with our ffmpeg with h264 support

See merge request !413
2 jobs for master in 18 minutes and 35 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #163042
docker
build_linux

00:18:35

passed #163043
macosx
build_macosx

00:10:00