[FFmpeg-cvslog] Merge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Jul 22 17:06:16 2015 +0200| [fa7defc89a7b6716aa853451134e5663cabb902d] | committer: Michael Niedermayer

Merge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd'

* commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd':
  asfdec: close the demuxer properly when read_header is failing

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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