diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-20 16:02:43 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-20 16:05:51 +0100 |
| commit | 2feef75cb5e62faecd66b3a16978fda372f66324 (patch) | |
| tree | c817ae488e7a0e11089e4cf1dd3039906bc76b8f /libavfilter/vf_scale_vaapi.c | |
| parent | e07fa3008bcafc027e9aa654657bae1f1ac64f5d (diff) | |
| parent | 09a145b3c837273b1379321e44386a3233156e75 (diff) | |
| download | ffmpeg-2feef75cb5e62faecd66b3a16978fda372f66324.tar.gz | |
Merge commit '09a145b3c837273b1379321e44386a3233156e75'
* commit '09a145b3c837273b1379321e44386a3233156e75':
hwcontext_vdpau: Remove duplicate definition of GET_CALLBACK
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavfilter/vf_scale_vaapi.c')
0 files changed, 0 insertions, 0 deletions