RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Also use that to fix a warning in av_hwdevice_get_type_name().
This commit is contained in:
Mark Thompson 2017-03-23 19:49:39 +00:00
parent 0b9a237b23
commit 1bd986ed4b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/hwcontext.c
View File

@ -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;

2
libavutil/hwcontext.h
View File

@ -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;