[FFmpeg-cvslog] Merge commit 'cc96018c79cd4dc823e0cef938da2131e4660fe5'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Nov 10 18:19:15 2015 +0100| [23277aa24c1d3679ebb3f2f0ab13bea5c402fc8f] | committer: Hendrik Leppkes

Merge commit 'cc96018c79cd4dc823e0cef938da2131e4660fe5'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23277aa24c1d3679ebb3f2f0ab13bea5c402fc8f
---