Merge remote-tracking branch 'lukaszmluki/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Feb 2014 23:02:27 +0000 (00:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Feb 2014 23:02:30 +0000 (00:02 +0100)
* lukaszmluki/master:
  lavd/opengl_enc: implement uncoded frame callback
  lavd/opengl_enc: add gray8/16 formats

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

Trivial merge