Merge commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 17:34:27 +0000 (19:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 17:34:31 +0000 (19:34 +0200)
* commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5':
  resample: reindent

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

Simple merge