Merge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd'
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 22 Jul 2015 15:06:16 +0000 (17:06 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 22 Jul 2015 15:06:22 +0000 (17:06 +0200)
commitfa7defc89a7b6716aa853451134e5663cabb902d
tree8b8cd80b64e69bf0156358e092e45123b49bb801
parentfce350be0e7595846a6ce1a28bf240967283643e
parent93f16f338f9e8aba0c006752eb3afc3fe6e137fd
Merge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd'

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

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/asfdec_o.c