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)
commit65088b925a0dc2defdeaffbbc24963ef34af7834
treecdfad73085dbe5a601bcbc3e464fb6385dbef720
parent6d6bd16fce080bd7af1a3ef02c3354c360948e15
parentbe394968c81019887ef996a78a526bdd85d1e216
Merge commit 'be394968c81019887ef996a78a526bdd85d1e216'

* commit 'be394968c81019887ef996a78a526bdd85d1e216':
  resample: add initial padding explicitly

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