Merge commit '7e90133f6420b1c53652f972b9561600822881ee'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 May 2014 12:02:19 +0000 (14:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 May 2014 12:02:19 +0000 (14:02 +0200)
commitdbd1fdd21400189f64aedde6a94ea14beca5a85e
tree3b647f612fbc4310b2a56c0eb690c0cc3c21818f
parent6a72260e6baf38403c8c26d010425f52dea7817a
parent7e90133f6420b1c53652f972b9561600822881ee
Merge commit '7e90133f6420b1c53652f972b9561600822881ee'

* commit '7e90133f6420b1c53652f972b9561600822881ee':
  build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined

Conflicts:
common.mak

See: efa95968317411179b0016af54745906029c2295
Merged-by: Michael Niedermayer <michaelni@gmx.at>
common.mak