From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 12 Feb 2014 15:36:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: n2.2-rc1~306
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/3e8b17f05b916087755e79545e63d92ae6323a05

Merge remote-tracking branch 'qatar/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

3e8b17f05b916087755e79545e63d92ae6323a05