Merge commit '796268654c7807c9a1cfb322c838383e2b900d60'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 14:34:14 +0000 (16:34 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 14:34:18 +0000 (16:34 +0200)
commitd2e5297e9369decddec936a2ed8177be53a6b99d
tree0c39e979b5fc5a9e71589a98501edb70b184490e
parent839d6bc192f7ef94343872ff039799501af38855
parent796268654c7807c9a1cfb322c838383e2b900d60
Merge commit '796268654c7807c9a1cfb322c838383e2b900d60'

* commit '796268654c7807c9a1cfb322c838383e2b900d60':
  asfdec: always reset packet state after seeking

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