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)
commit23277aa24c1d3679ebb3f2f0ab13bea5c402fc8f
treed60d5ae253868ecb79dd12972a0d0552d92ac7b9
parent947447bfdc6972dc1bbba1125b1e8c763a2ac177
parentcc96018c79cd4dc823e0cef938da2131e4660fe5
Merge commit 'cc96018c79cd4dc823e0cef938da2131e4660fe5'

* commit 'cc96018c79cd4dc823e0cef938da2131e4660fe5':
  libopenh264enc: Set AVOption data type

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