Michael Niedermayer 760f7d3a90 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@gmx.at>

2013-05-03 15:50:01 +02:00

25 KiB

Raw Blame History

View Raw