Merge commit '2a2889e130fee6d3c11e506328388afb317626ed'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 11:43:18 +0000 (13:43 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 11:43:18 +0000 (13:43 +0200)
commitcea5e7355c58004605321295b7a506052292dbbc
tree2762cd1cb9f18efe47fe8a888d443893a2a24222
parent527f89e05922e840083ac6d49eeb838b1e350dd4
parent2a2889e130fee6d3c11e506328388afb317626ed
Merge commit '2a2889e130fee6d3c11e506328388afb317626ed'

* commit '2a2889e130fee6d3c11e506328388afb317626ed':
  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
802d94c36edcd05b53a56ee359d9559cc4e11597)

Merged-by: Clément Bœsch <cboesch@gopro.com>