Fix in select_videofps a merge conflict error.