Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 08:53:44 +0000 (10:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 08:55:46 +0000 (10:55 +0200)
* qatar/master:
  configure: Check for GCC diagnostic pragma support inside of functions

This commit was cherry picked previously already to prevent compilation failure on a previous merge
See: 038c4f65ee6c72f9d1ee4d4e46c74073992fabc8

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

Trivial merge