Merge commit 'f20892eb67a7b4b5a3c080388a35a3380516a805'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 17:24:40 +0000 (19:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 17:34:03 +0000 (19:34 +0200)
* commit 'f20892eb67a7b4b5a3c080388a35a3380516a805':
  resample: split the nearest neighbour path into a separate function pointer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavresample/resample.c
libavresample/resample_template.c

Simple merge
Simple merge