Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 13:38:46 +0000 (15:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 13:50:01 +0000 (15:50 +0200)
commit760f7d3a90bf4ab7ca396c62aa239b75c7ac6f59
treeb6970fed9789f0e2d78a997dbf213e3ada29ef49
parent0966623604a92bc7fa6213e7dfb9c03d007ab3e9
parent769d921f3e4d3808320238f4f33b47cd492f1c04
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>
configure
libavformat/id3v2.c