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

Merge commit '1bd986ed4b0e95ded368a8eeb5c044853c090f9b' 

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

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-24 19:14:22 -03:00
parent c0683dce89 1bd986ed4b
commit 4e9dc52a97
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

@ -79,7 +79,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,13 +25,13 @@
#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_VIDEOTOOLBOX,
AV_HWDEVICE_TYPE_NONE,
AV_HWDEVICE_TYPE_D3D11VA,
AV_HWDEVICE_TYPE_DRM,
};