Merge remote-tracking branch 'lukaszmluki/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Apr 2014 22:50:34 +0000 (00:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Apr 2014 22:50:37 +0000 (00:50 +0200)
* lukaszmluki/master:
  lavd/qtkit: add device category
  lavd/fbdev_enc: implement get_device_list
  lavd: no default device unless explicitly set

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

Trivial merge