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)
* commit '20a8ee3061e6d777600c13db731bee3c25878991':
  af_asyncts: fix compensation and PTS monotonicity

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

Simple merge