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)
commitd3284a62082b8224d2a31e050f160ccda9ce2487
tree360df477a1ba2d25e257e6661bc0c777aacc8e13
parent275155081f2e250b707aa89fec21d09dff6bb8d6
parentdefb87eef4ddcfcabfbc3884ff8490dcb4e206c5
Merge remote-tracking branch 'lukaszmluki/master'

* 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>