Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 10:24:12 +0000 (12:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 10:48:11 +0000 (12:48 +0200)
commit3cd6b6aa0f847afeeac7742489f139ce39b4bdcb
treef13fbf33a3a31f9677c3d4782ac0ea8366e180e8
parent0d5a27c2b5a1a2981f53aa5c093d1ddcc4ff472b
parent5bdfc17189e4ea63c6b46b6d5256852fcb409d68
Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68'

* commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68':
  asf: Do not skip data streams

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