[FFmpeg-cvslog] Merge commit '40d5df67d2c4e1f0dd1e902435567eb5edad6a9a'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 16:58:15 2017 -0300| [1338cc1ac2933aed04ef3a6adc1f4c305e6b2435] | committer: James Almer

Merge commit '40d5df67d2c4e1f0dd1e902435567eb5edad6a9a'

* commit '40d5df67d2c4e1f0dd1e902435567eb5edad6a9a':
  configure: Add a comment about why we don't try to enable pic on arm on target_os=win32

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1338cc1ac2933aed04ef3a6adc1f4c305e6b2435
---

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 717ae61e24..b734c3f842 100755
--- a/configure
+++ b/configure
@@ -5481,6 +5481,7 @@ EOF
 .object_arch armv4
 EOF
 
+    # MS armasm fails to assemble our PIC constructs
     [ $target_os != win32 ] && enabled_all armv6t2 shared !pic && enable_weak_pic
 
 elif enabled mips; then


======================================================================