Merge commit '09f2581dc5edb3642858d69d9a70b67e249167e9'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 13:50:59 +0000 (15:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 13:51:27 +0000 (15:51 +0200)
commite1f74ad1f0102648e2db8e4fda788f47d38a94ad
treea415202d6f9e2edc597ddb433309cf71ddc1f0f6
parentdda7bd13b3498243a199c77aac4fca602147828f
parent09f2581dc5edb3642858d69d9a70b67e249167e9
Merge commit '09f2581dc5edb3642858d69d9a70b67e249167e9'

* commit '09f2581dc5edb3642858d69d9a70b67e249167e9':
  msvc/icl: Use __declspec(deprecated)

Conflicts:
configure

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