Merge commit '81726a4f0b8a43e19898e2a36fdde80583bafff0'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 12:17:58 +0000 (13:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 12:18:04 +0000 (13:18 +0100)
commite88f392733fe6269fdb3fea2627b037ff654c4ce
tree068d259a9c4f09784166bb162a16dac0567ec5df
parent9a714d871ac5c7dc6d35aec56caca0c5ede68fba
parent81726a4f0b8a43e19898e2a36fdde80583bafff0
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@gmx.at>
libavformat/asfdec.c