[FFmpeg-cvslog] Merge remote-tracking branch 'lukaszmluki/master'

Mon Feb 17 03:39:15 CET 2014

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 17 03:18:44 2014 +0100| [38a08e0aea0255e8a960bd5d6b21104c889f27f2] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38a08e0aea0255e8a960bd5d6b21104c889f27f2
---