Merge commit 'cc96018c79cd4dc823e0cef938da2131e4660fe5'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:19:15 +0000 (18:19 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:19:15 +0000 (18:19 +0100)
* commit 'cc96018c79cd4dc823e0cef938da2131e4660fe5':
  libopenh264enc: Set AVOption data type

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge