diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 15:24:08 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 15:24:08 -0300 |
| commit | 1a24d4f020ee52154d2b369d6fc3d5056b5719c8 (patch) | |
| tree | cb1833b78332d6f400ed4d960e4b2ca5043b63d0 /libavdevice/opengl_enc_shaders.h | |
| parent | 8c82c4d25d363eca035f2c23e8257c1d4c7a20d3 (diff) | |
| parent | ea25ccd1b2a980df8d43cc1f86a23e3c094090a6 (diff) | |
| download | ffmpeg-1a24d4f020ee52154d2b369d6fc3d5056b5719c8.tar.gz | |
Merge commit 'ea25ccd1b2a980df8d43cc1f86a23e3c094090a6'
* commit 'ea25ccd1b2a980df8d43cc1f86a23e3c094090a6':
qsv: Join the derived session to the parent
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavdevice/opengl_enc_shaders.h')
0 files changed, 0 insertions, 0 deletions