[FFmpeg-cvslog] Merge commit '92f0aceb36c6e4412d4cf346e70dc74b5a4069e9'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 15:27:47 2017 -0300| [b212eff773b860d6f7da0f29d49947bd384f718f] | committer: James Almer

Merge commit '92f0aceb36c6e4412d4cf346e70dc74b5a4069e9'

* commit '92f0aceb36c6e4412d4cf346e70dc74b5a4069e9':
  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 at gmail.com>

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