Merge commit '2a2889e1'

* commit '2a2889e1':
  build: Remove stray duplicate conditional variable declaration

This commit is a noop, there is no duplicate in FFmpeg. we have the
tools rules kept in the root Makefile though (see
802d94c3)
Merged-by: Clément Bœsch <cboesch@gopro.com>