Merge commit '20a8ee3061e6d777600c13db731bee3c25878991'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Mar 2013 11:16:29 +0000 (12:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Mar 2013 11:16:32 +0000 (12:16 +0100)
commit9bb6504e3bff2e00610f52cc41938aa8c2a3ad4c
tree48a92bff12218bfdb73d4aa28ce001c593925f5d
parent6efe61486d775c42dd344a78990dfed16a9512ef
parent20a8ee3061e6d777600c13db731bee3c25878991
Merge commit '20a8ee3061e6d777600c13db731bee3c25878991'

* commit '20a8ee3061e6d777600c13db731bee3c25878991':
  af_asyncts: fix compensation and PTS monotonicity

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_asyncts.c