From: Hendrik Leppkes <h.leppkes@gmail.com>
Date: Sun, 2 Aug 2015 08:41:56 +0000 (+0200)
Subject: Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2ab827389bc17972dfe58b768083593b1f1bf776;p=ffmpeg

Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672'

* commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672':
  asfdec: remove improper assignement that caused wrong timestamps

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
---

2ab827389bc17972dfe58b768083593b1f1bf776