Merge commit '61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 11:18:50 +0000 (12:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 11:25:40 +0000 (12:25 +0100)
commit3600049dae9ec886d6e0b8b3cb478357f6534865
treeb03090d2c59ab9c274534647d1df92a406e4bd2f
parent0af4506e15a69209fe9d426226e107d24ee0e834
parent61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e
Merge commit '61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e'

* commit '61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e':
  asfdec: read the full Metadata Object, not just aspect ratio information

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