Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:41:56 +0000 (10:41 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:41:56 +0000 (10:41 +0200)
commit2ab827389bc17972dfe58b768083593b1f1bf776
treeb6adba825e499dfbe3babf193ea419650203b7f9
parent07094e5e405408df593d16421286bb9eb4188365
parent33dc1913ab7aaefc991b3e665d1d0b5d0b088672
Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/asfdec_o.c