[FFmpeg-cvslog] Merge commit '96e476cc9d414e248692c773d9dce736662572b8'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Feb 11 22:49:35 2018 -0300| [cb2205863b9505441956a459fffe7fed212ea54a] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb2205863b9505441956a459fffe7fed212ea54a
---