[FFmpeg-cvslog] Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Aug  2 10:41:56 2015 +0200| [2ab827389bc17972dfe58b768083593b1f1bf776] | committer: Hendrik Leppkes

Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ab827389bc17972dfe58b768083593b1f1bf776
---