Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 May 2013 12:32:43 +0000 (14:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 May 2013 12:32:43 +0000 (14:32 +0200)
* qatar/master:
  msvc: Move linker pragma from config.h to libavutil/internal.h

Conflicts:
configure

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

diff --cc configure
+++ b/configure
  
  enabled getenv || echo "#define getenv(x) NULL" >> $TMPH
  
- if enabled msvc && ! enabled shared; then
-     echo '#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod")' >> $TMPH
-     echo '#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf")' >> $TMPH
- fi
 +
 +mkdir -p doc
 +echo "@c auto-generated by configure" > doc/config.texi
 +
  print_config ARCH_   "$config_files" $ARCH_LIST
  print_config HAVE_   "$config_files" $HAVE_LIST
  print_config CONFIG_ "$config_files" $CONFIG_LIST       \
Simple merge