[FFmpeg-cvslog] Merge commit '61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 10 12:18:50 2013 +0100| [3600049dae9ec886d6e0b8b3cb478357f6534865] | committer: Michael Niedermayer

Merge commit '61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3600049dae9ec886d6e0b8b3cb478357f6534865
---