Merge commit 'ca8c62d187fdca13979379fb2ab172ed662aa2f8' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Nov 2014 12:22:09 +0000 (13:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Nov 2014 12:22:09 +0000 (13:22 +0100)
* commit 'ca8c62d187fdca13979379fb2ab172ed662aa2f8':
  resample: Avoid off-by-1 errors in PTS calcs.

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

Simple merge