Merge commit '5f794aa1653aa04c1da7397e9ccacad947fadf5f'
authorJames Almer <jamrial@gmail.com>
Tue, 17 Oct 2017 23:26:00 +0000 (20:26 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 17 Oct 2017 23:28:59 +0000 (20:28 -0300)
commit6007f7d4665e970714c2962c0ddb7de910d9da0c
tree199d6b22ab0f54964528cd45dc892f8da5ab8ac2
parent8f2cc2f1e9ef7611cbba43fe96f331271b4844fd
parent5f794aa1653aa04c1da7397e9ccacad947fadf5f
Merge commit '5f794aa1653aa04c1da7397e9ccacad947fadf5f'

* commit '5f794aa1653aa04c1da7397e9ccacad947fadf5f':
  Add Cineform HD Decoder

See 3485332bf99602910fe8830b0230d02fc653135d.

Some cosmetics are merged. The refactoring is not merged at the
request of Kieran Kunhya.

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/cfhd.c
libavcodec/cfhd.h
libavcodec/cfhddata.c