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)
commitfb7d64df7e3b4894460c23ef3005030a5f86b5d1
tree46258fc7d79e69ce29ef471ea76d2f8a59681730
parent671f9086571adc5de48ae1ef3be01cf194864a49
parent3c84f6b5d20cd345fac706f8cfb70c55e541ffb5
Merge commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5'

* commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5':
  resample: reindent

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