Merge commit 'ed3b2a999d189771c9b0ada9a9200117595fa474'
authorJames Almer <jamrial@gmail.com>
Tue, 7 Nov 2017 21:12:17 +0000 (18:12 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 7 Nov 2017 21:32:53 +0000 (18:32 -0300)
commit5371274329012c3b5ff3f5a254366d2f7fed6867
tree6ebc2654e98a478b61e3ce9d7e3fc4cf92ba15a1
parentce52e430b2df17b5efa28669f6c58992758f9913
parented3b2a999d189771c9b0ada9a9200117595fa474
Merge commit 'ed3b2a999d189771c9b0ada9a9200117595fa474'

* commit 'ed3b2a999d189771c9b0ada9a9200117595fa474':
  cinepakenc: misc small changes
  cinepakenc: K&R formatting cosmetics
  cinepakenc: Stop using AVPicture
  cinepakenc: Drop broken debug code
  cinepakenc: add option handling for flexibility
  cinepakenc: fixes and improvements
  Add Cinepak encoder

See
59dbc36f49db5cfd9d2ad4b00ef2e3336173ee8d
762c4dc082764896e27f3c53c14a65871d8fe910
bf23642dcc86890fa2e32697c3b930b3f1ac0d88
0ab25dac2f0b170ecc0e37530cf15f83b9f9e56d

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