Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 18:38:59 +0000 (20:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 18:39:04 +0000 (20:39 +0200)
* commit '254c95cdd1b669a722204a4a65974fc2523c8f83':
  resample: split linear into its own function

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

Simple merge
Simple merge