ffmpeg: default to non git version, git version makes gst-ffmpeg fail
Merge branch 'experimental/updates' into refs/top-bases/experimental/marc

* experimental/updates:
  ffmpeg: default to non git version, git version makes gst-ffmpeg fail
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  ffmpeg: default to non git version, git version makes gst-ffmpeg fail