This can be done as an independent PR in rg3/youtube-dl