[FFmpeg-cvslog] Merge commit '81726a4f0b8a43e19898e2a36fdde80583bafff0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 10 13:17:58 2013 +0100| [e88f392733fe6269fdb3fea2627b037ff654c4ce] | committer: Michael Niedermayer

Merge commit '81726a4f0b8a43e19898e2a36fdde80583bafff0'

* commit '81726a4f0b8a43e19898e2a36fdde80583bafff0':
  FATE: add tests for additional flavors of asf cover art
  asfdec: do not assume every AVStream has a corresponding ASFStream

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

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