diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 00:02:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 00:02:30 +0100 |
| commit | 70acb151591214e2287a6d7a0e863395657ee533 (patch) | |
| tree | 4bf46ef42248104afcaf4cdb7caef72998316f1d /libavdevice/file_open.c | |
| parent | e2707a7cf7416ea14d21b8924daf1de8d85ea7af (diff) | |
| parent | db4a704482b067b46ca66429ae8b2c6be06527e9 (diff) | |
| download | ffmpeg-70acb151591214e2287a6d7a0e863395657ee533.tar.gz | |
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>
Diffstat (limited to 'libavdevice/file_open.c')
0 files changed, 0 insertions, 0 deletions