[FFmpeg-cvslog] Merge commit 'be394968c81019887ef996a78a526bdd85d1e216'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 11 20:24:06 2014 +0200| [65088b925a0dc2defdeaffbbc24963ef34af7834] | committer: Michael Niedermayer

Merge commit 'be394968c81019887ef996a78a526bdd85d1e216'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=65088b925a0dc2defdeaffbbc24963ef34af7834
---