Merge commit '619a433eca2c5655c41b799e0b06380020fb1498'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 21:18:00 +0000 (18:18 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 21:18:00 +0000 (18:18 -0300)
commitc0cfc0ce11c14285299838d2c1e96159bf9cb9de
tree6f1a81656520ec4b3bc74057b98c490e01741de3
parentb773a8d8c1dfe4cfc6eabf509e26ab011270b9ed
parent619a433eca2c5655c41b799e0b06380020fb1498
Merge commit '619a433eca2c5655c41b799e0b06380020fb1498'

* commit '619a433eca2c5655c41b799e0b06380020fb1498':
  lavu: Drop deprecated option type

Merged-by: James Almer <jamrial@gmail.com>
libavutil/opt.h
libavutil/version.h