tree 6ef48a53c6a992abbd7a68d10a4751e2bafa95ab
parent 8e101086ebbf73f6ef0756ace3e1b42ecbb1eff2
parent 2e693be7e9b1a70360dd6849a58fae74b16afba1
author Michael Niedermayer <michaelni@gmx.at> 1333326343 +0200
committer Michael Niedermayer <michaelni@gmx.at> 1333326349 +0200

Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

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

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