diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-22 12:59:20 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-22 12:59:20 +0100 |
| commit | 4205010240fe013eaef25e6b8b86e7361dfbd27f (patch) | |
| tree | 94cf09deeff4407631d78d6b2daf0b4cd2622297 /libavfilter/vf_mergeplanes.c | |
| parent | c66bd8f3ff2809876795594a9e2fa3cc76462e09 (diff) | |
| parent | 2124711b950b03c582a119c75f52a87acc32d6ec (diff) | |
| download | ffmpeg-4205010240fe013eaef25e6b8b86e7361dfbd27f.tar.gz | |
Merge commit '2124711b950b03c582a119c75f52a87acc32d6ec'
* commit '2124711b950b03c582a119c75f52a87acc32d6ec':
hwcontext_vaapi: add a quirk for the missing MemoryType attribute
This commit is a noop, see 775a8477b74bb2fa95ca2b13c08f3fd8d6c617b6
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavfilter/vf_mergeplanes.c')
0 files changed, 0 insertions, 0 deletions