Merge commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 18:39:38 +0000 (20:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 18:39:38 +0000 (20:39 +0200)
commita4557b7a98f78222d9616fb36cb8073cd16f11ff
tree458602df0a2d7566f5f5f541e4cd40335729cbba
parent56f0fe6b8434d25917c41a343323950291d8db21
parenta6f19d6a9f8d1e08653d9d77581e8c823f4955c2
Merge commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2'

* commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2':
  configure: Support MSVC 2015

Conflicts:
configure
libavutil/internal.h

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