summaryrefslogtreecommitdiff
path: root/libavfilter/vf_overlay_qsv.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-11-11 14:15:45 -0300
committerJames Almer <jamrial@gmail.com>2017-11-11 14:15:45 -0300
commit64f9188aae2d5b9f94550285385c0110ea784226 (patch)
tree57b57a2c0cd6b173ab5aff498d0fa0b0cf406135 /libavfilter/vf_overlay_qsv.c
parent3af2bf0af04920d3b4fe50711f57926921c3614f (diff)
parentac6691ab9938107d818cd8066ce3ea329ad14d8d (diff)
Merge commit 'ac6691ab9938107d818cd8066ce3ea329ad14d8d'
* commit 'ac6691ab9938107d818cd8066ce3ea329ad14d8d': avio: update avio_alloc_context() doxy This commit is a noop, see 877076ffa17bcf56badedc036cdc1adcd9f38b24 Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/vf_overlay_qsv.c')
0 files changed, 0 insertions, 0 deletions