Packaging fixups after ffmpeg version bump - PR 2621