Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Apr 2012 22:52:23 +0000 (00:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Apr 2012 22:52:23 +0000 (00:52 +0200)
commit976d173606769e09442d1ab2ca1436ffd96a35be
tree1b3a8716960300c939d8cd71dc29f361ff91e920
parentf9bdc93723cc38f91de68d364854e7fa6b5857eb
parent989431c02ffcfdeb210cf42765e820130eb4b255
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

* qatar/release/0.8:
  id3v2: fix skipping extended header in id3v2.4

Conflicts:
libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/id3v2.c