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)
* commit '1bd986ed4b0e95ded368a8eeb5c044853c090f9b':
  hwcontext: Move NONE to the be the first member of AVHWDeviceType

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

Simple merge
@@@ -30,10 -31,6 +31,9 @@@ enum AVHWDeviceType 
      AV_HWDEVICE_TYPE_VAAPI,
      AV_HWDEVICE_TYPE_DXVA2,
      AV_HWDEVICE_TYPE_QSV,
-     AV_HWDEVICE_TYPE_NONE,
 +    AV_HWDEVICE_TYPE_VIDEOTOOLBOX,
 +    AV_HWDEVICE_TYPE_D3D11VA,
 +    AV_HWDEVICE_TYPE_DRM,
  };
  
  typedef struct AVHWDeviceInternal AVHWDeviceInternal;