Merge commit 'fe082998683334e7f573cfe3876810fb80c5249c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 21:33:18 +0000 (22:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 21:34:08 +0000 (22:34 +0100)
* commit 'fe082998683334e7f573cfe3876810fb80c5249c':
  build: Use -Werror=format-security

Conflicts:
configure

See: 97592faa51eacda9a949c4f0ba2a6d7989ef5f3b
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge