Merge commit 'f44ec22e095c5ba00ffeadd891655c456e3dd014'
authorJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 02:16:43 +0000 (23:16 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 02:16:43 +0000 (23:16 -0300)
commit24ee1b8c6343f00a3f5cd5d5aee5850f22436204
tree44d50b299738c39f3631855bf5a67464ec0d4540
parent3b345d389be2d67017f904caa21713f53a8e8c90
parentf44ec22e095c5ba00ffeadd891655c456e3dd014
Merge commit 'f44ec22e095c5ba00ffeadd891655c456e3dd014'

* commit 'f44ec22e095c5ba00ffeadd891655c456e3dd014':
  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.html

Merged-by: James Almer <jamrial@gmail.com>