hwcontext: Move NONE to the be the first member of AVHWDeviceType

Also use that to fix a warning in av_hwdevice_get_type_name().
pull/272/head
Mark Thompson 8 years ago
parent 0b9a237b23
commit 1bd986ed4b
  1. 3
      libavutil/hwcontext.c
  2. 2
      libavutil/hwcontext.h

@ -67,7 +67,8 @@ enum AVHWDeviceType av_hwdevice_find_type_by_name(const char *name)
const char *av_hwdevice_get_type_name(enum AVHWDeviceType type)
{
if (type >= 0 && type < FF_ARRAY_ELEMS(hw_type_names))
if (type > AV_HWDEVICE_TYPE_NONE &&
type < FF_ARRAY_ELEMS(hw_type_names))
return hw_type_names[type];
else
return NULL;

@ -25,12 +25,12 @@
#include "pixfmt.h"
enum AVHWDeviceType {
AV_HWDEVICE_TYPE_NONE,
AV_HWDEVICE_TYPE_VDPAU,
AV_HWDEVICE_TYPE_CUDA,
AV_HWDEVICE_TYPE_VAAPI,
AV_HWDEVICE_TYPE_DXVA2,
AV_HWDEVICE_TYPE_QSV,
AV_HWDEVICE_TYPE_NONE,
};
typedef struct AVHWDeviceInternal AVHWDeviceInternal;

Loading…
Cancel
Save