Merge remote-tracking branch 'lukaszmluki/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Mar 2014 02:41:45 +0000 (03:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Mar 2014 02:41:49 +0000 (03:41 +0100)
commitf34cceb1fc58076ac69bef44bf07d8373e58f83d
tree91c74321cfecee10af075f748264cffb5b3c5727
parentec6d043f8e5842389b58e0a62cf952b14a5a16fc
parent06fed44051d0258127f55afa4dd07dfbff021327
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/avdevice: add device iterators
  lavd: add categories to device implementations
  lavu/log: add device categories

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