Michael Niedermayer 38a08e0aea 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>

2014-02-17 03:18:44 +01:00

70 KiB

Raw Blame History

View Raw