Merge commit 'f44ec22e'

* commit 'f44ec22e':
  lavc: use av_cpu_max_align() instead of hardcoding alignment requirements

This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.htmlMerged-by: James Almer <jamrial@gmail.com>