[Milhouse]

@rse... I don't think 0470bc37 has applied correctly against ffmpeg - it's only applied against kodi... checking.

Edit: Yep, it's going to need a tweak to the de-tooling logic... it's a squash so there's no Makefile which means this patch isn't processed correctly...