Merge commit 'be394968c81019887ef996a78a526bdd85d1e216'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 18:24:06 +0000 (20:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 18:38:38 +0000 (20:38 +0200)
* commit 'be394968c81019887ef996a78a526bdd85d1e216':
  resample: add initial padding explicitly

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

Simple merge
Simple merge