Merge commit '1bd986ed4b0e95ded368a8eeb5c044853c090f9b'
authorJames Almer <jamrial@gmail.com>
Tue, 24 Oct 2017 22:14:22 +0000 (19:14 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 24 Oct 2017 22:14:22 +0000 (19:14 -0300)
commit4e9dc52a9703f84a0e996263018745afa1118aa0
treeb57070b2e4193448dccc8be1343316aa21b5899e
parentc0683dce89eceaab8783b8b47dd2346afc0a9276
parent1bd986ed4b0e95ded368a8eeb5c044853c090f9b
Merge commit '1bd986ed4b0e95ded368a8eeb5c044853c090f9b'

* commit '1bd986ed4b0e95ded368a8eeb5c044853c090f9b':
  hwcontext: Move NONE to the be the first member of AVHWDeviceType

Merged-by: James Almer <jamrial@gmail.com>
libavutil/hwcontext.c
libavutil/hwcontext.h