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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 15:38:46 2013 +0200| [760f7d3a90bf4ab7ca396c62aa239b75c7ac6f59] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  compat: msvc: Make sure the object files are included when linking statically
  id3v2: check for end of file while unescaping tags

Conflicts:
	configure
	libavformat/id3v2.c

Note, ffmpeg is not affected by the out of buffer write bug

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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