Merge commit '96e476cc9d414e248692c773d9dce736662572b8'
authorJames Almer <jamrial@gmail.com>
Mon, 12 Feb 2018 01:49:35 +0000 (22:49 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 12 Feb 2018 01:49:35 +0000 (22:49 -0300)
commitcb2205863b9505441956a459fffe7fed212ea54a
tree13f943fe2c1212e27d3bdac766c19d9b7cf39fee
parent6c59f05c74d87b169bd9775e6a399ed298742137
parent96e476cc9d414e248692c773d9dce736662572b8
Merge commit '96e476cc9d414e248692c773d9dce736662572b8'

* commit '96e476cc9d414e248692c773d9dce736662572b8':
  hwcontext: Fix documentation for av_hwdevice_ctx_alloc()

This commit is a noop, see 9365dfcbf665b83b2e60c5ec5e2abf1f0a49e2c3

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