[ffmpeg/f34: 2/2] Merge branch 'master' into f34