diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 15:27:47 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 15:27:47 -0300 |
| commit | b212eff773b860d6f7da0f29d49947bd384f718f (patch) | |
| tree | cb1833b78332d6f400ed4d960e4b2ca5043b63d0 /libavdevice/opengl_enc_shaders.h | |
| parent | 1a24d4f020ee52154d2b369d6fc3d5056b5719c8 (diff) | |
| parent | 92f0aceb36c6e4412d4cf346e70dc74b5a4069e9 (diff) | |
| download | ffmpeg-b212eff773b860d6f7da0f29d49947bd384f718f.tar.gz | |
Merge commit '92f0aceb36c6e4412d4cf346e70dc74b5a4069e9'
* commit '92f0aceb36c6e4412d4cf346e70dc74b5a4069e9':
cinepakenc: Move declaration out of for initialisation statement
hapdec: Delete include for nonexistent file
hevc: Fix aligned array declarations
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavdevice/opengl_enc_shaders.h')
0 files changed, 0 insertions, 0 deletions