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)
* commit 'b7ab6e18eecad43593ad2a0e9fc9eba7f24751cb':
  mmaldec: disable timestamp interpolation

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

Simple merge