[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  8 14:32:43 2013 +0200| [8d9537228f034037e710146291a933f0f4f554be] | committer: Michael Niedermayer

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 at gmx.at>

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