Late branching for F-20 because of FFmpeg deps needfix