Merge remote-tracking branch 'lukaszmluki/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Jan 2014 22:45:14 +0000 (23:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Jan 2014 22:45:22 +0000 (23:45 +0100)
commitc94ed2a729649f614dc433032b3b3ca189057644
tree60aba0aaf5da0547d85e06855eb8f621e66fc753
parent673ce8e46ae229c0f1c72fc9a48ce16dd360e3ab
parentded6b3af41cd5d41f4df728ced4b194cf0426105
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd: add opengl device
  lavd: add avdevice_dev_to_app_control_message API
  lavd: add avdevice_app_to_dev_control_message API

Merged-by: Michael Niedermayer <michaelni@gmx.at>