1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

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>
This commit is contained in:
James Almer 2017-11-11 15:27:47 -03:00
commit b212eff773

Diff Content Not Available