[FFmpeg-cvslog] Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 30 12:24:12 2015 +0200| [3cd6b6aa0f847afeeac7742489f139ce39b4bdcb] | committer: Michael Niedermayer

Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68'

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

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

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