Merge commit '92f0aceb36c6e4412d4cf346e70dc74b5a4069e9'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 18:27:47 +0000 (15:27 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 18:27:47 +0000 (15:27 -0300)
commitb212eff773b860d6f7da0f29d49947bd384f718f
treecb1833b78332d6f400ed4d960e4b2ca5043b63d0
parent1a24d4f020ee52154d2b369d6fc3d5056b5719c8
parent92f0aceb36c6e4412d4cf346e70dc74b5a4069e9
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@gmail.com>