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)
commit70acb151591214e2287a6d7a0e863395657ee533
tree4bf46ef42248104afcaf4cdb7caef72998316f1d
parente2707a7cf7416ea14d21b8924daf1de8d85ea7af
parentdb4a704482b067b46ca66429ae8b2c6be06527e9
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/opengl_enc: implement uncoded frame callback
  lavd/opengl_enc: add gray8/16 formats

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