Merge remote-tracking branch 'lippit/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Nov 2012 01:24:11 +0000 (02:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Nov 2012 01:24:17 +0000 (02:24 +0100)
commitb61658829b2f94126196b0accca4e4703fba2c1f
tree852590abd4ee62ce6c0e1aaee7865ff755569fcf
parent9f088712d4544768e57183f5f21678c60c60fa11
parent15b02ddee033aec69e75e2c1cdc3de085133d959
Merge remote-tracking branch 'lippit/master'

* lippit/master:
  Update iec61883 to handle multiple devices, and allow selection of DV device by its GUID

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