-
Michael Niedermayer authored
* lukaszmluki/master: lavd: add list devices API lavd/opengl_enc_shaders: fix gray* shader Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
38a08e0a
* lukaszmluki/master:
lavd: add list devices API
lavd/opengl_enc_shaders: fix gray* shader
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>