Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 12:06:16 +0000 (13:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 12:06:16 +0000 (13:06 +0100)
commit9a714d871ac5c7dc6d35aec56caca0c5ede68fba
tree5fb2cf0b1f1c6c8c53231cf128654e3f1f918658
parentd80820655362645ae1c65d457287d7d12c04a44f
parentf5fac6f77752931347ab302563802dcaa49c2419
Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419'

* commit 'f5fac6f77752931347ab302563802dcaa49c2419':
  asfdec: support reading ID3v2 tags in ASF files

Conflicts:
Changelog
libavformat/asfdec.c

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