Merge commit '92f0aceb'

* commit '92f0aceb':
  cinepakenc: Move declaration out of for initialisation statement
  hapdec: Delete include for nonexistent file
  hevc: Fix aligned array declarations

This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>