Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 15:36:04 +0000 (16:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 15:36:15 +0000 (16:36 +0100)
commit3e8b17f05b916087755e79545e63d92ae6323a05
treed1b9d75769a1fbc2127c08850f9c7c8bd7dffe71
parentf73901f815d0c6e1e9dbe6d8541e43d633b06d63
parentf5d92d9cab07429b084c88262d9af1735ac8914a
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  asfdec: fix seeking with fragmented packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/asfdec.c