Merge commit 'b7ab6e18eecad43593ad2a0e9fc9eba7f24751cb'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:29:29 +0000 (13:29 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:29:29 +0000 (13:29 +0200)
commit30fb54c23f520c4bd1f6563ea1821de96b8f4a17
tree9f2838d1f34c25b9644dbe73f1b5a6a1bfb84c06
parent45ae2997858d408b140d0f785dbb0f09369b7367
parentb7ab6e18eecad43593ad2a0e9fc9eba7f24751cb
Merge commit 'b7ab6e18eecad43593ad2a0e9fc9eba7f24751cb'

* commit 'b7ab6e18eecad43593ad2a0e9fc9eba7f24751cb':
  mmaldec: disable timestamp interpolation

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