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)
* commit '619a433eca2c5655c41b799e0b06380020fb1498':
  lavu: Drop deprecated option type

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

diff --cc libavutil/opt.h
Simple merge
Simple merge