Merge commit 'ac6691ab9938107d818cd8066ce3ea329ad14d8d'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 17:15:45 +0000 (14:15 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 17:15:45 +0000 (14:15 -0300)
commit64f9188aae2d5b9f94550285385c0110ea784226
tree57b57a2c0cd6b173ab5aff498d0fa0b0cf406135
parent3af2bf0af04920d3b4fe50711f57926921c3614f
parentac6691ab9938107d818cd8066ce3ea329ad14d8d
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>