[FFmpeg-cvslog] Merge commit 'f20892eb67a7b4b5a3c080388a35a3380516a805'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 11 19:24:40 2014 +0200| [671f9086571adc5de48ae1ef3be01cf194864a49] | committer: Michael Niedermayer

Merge commit 'f20892eb67a7b4b5a3c080388a35a3380516a805'

* commit 'f20892eb67a7b4b5a3c080388a35a3380516a805':
  resample: split the nearest neighbour path into a separate function pointer

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=671f9086571adc5de48ae1ef3be01cf194864a49
---