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)
commit8d9537228f034037e710146291a933f0f4f554be
treeec0d82734940cb418d1f424b8c78936a8d703d32
parent63208c034bf660ed7f15bf09fdd4c813a6e6bf7a
parent06122c253394b10a694d3d95e00e503c89852134
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  msvc: Move linker pragma from config.h to libavutil/internal.h

Conflicts:
configure

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