Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 07:27:37 +0000 (09:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 07:27:37 +0000 (09:27 +0200)
commit85fc1a18ca7b875cf138d3a862779f8334fb2a57
tree94c708fb32da8f3dd9402e162124cefcbd1483a0
parentfa5410f61a75393d8019200ea8ef6a293ab050a1
parent3a7050ffed5ce061b114a11e4de4b77aba8efa0b
Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'

* commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b':
  build: Add _Pragma macro to disable deprecated declaration warnings

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavutil/internal.h