Merge remote-tracking branch 'lukaszmluki/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Feb 2014 02:18:44 +0000 (03:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Feb 2014 02:18:44 +0000 (03:18 +0100)
commit38a08e0aea0255e8a960bd5d6b21104c889f27f2
treed03453f7a0ce15802b7a333a9956e2d28cabf1b5
parentb02b78341799f8c2b013b7168f8687d835e47a1c
parent81c3f81d6f11bf1dad9c6f3de5938e665447b991
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd: add list devices API
  lavd/opengl_enc_shaders: fix gray* shader

Conflicts:
doc/APIchanges

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