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)
* commit 'ac6691ab9938107d818cd8066ce3ea329ad14d8d':
  avio: update avio_alloc_context() doxy

This commit is a noop, see 877076ffa17bcf56badedc036cdc1adcd9f38b24

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge