[FFmpeg-cvslog] Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 11 20:38:59 2014 +0200| [662a8d882758ac90cf55968fc7ab3540e51f2d0b] | committer: Michael Niedermayer

Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'

* commit '254c95cdd1b669a722204a4a65974fc2523c8f83':
  resample: split linear into its own function

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

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