Merge commit '5655236a67203d923755f285584c6e68abe7e33f'
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 22 Jul 2015 14:53:20 +0000 (16:53 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 22 Jul 2015 14:53:26 +0000 (16:53 +0200)
commitfce350be0e7595846a6ce1a28bf240967283643e
tree329ae2ea9064efd9a8c8ad3428e4f41ec563fb3e
parentfbdbe7a5d262db06ae44a7bd606d18954241c040
parent5655236a67203d923755f285584c6e68abe7e33f
Merge commit '5655236a67203d923755f285584c6e68abe7e33f'

* commit '5655236a67203d923755f285584c6e68abe7e33f':
  asfdec: factor out seeking to the Data Object outside while

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