diff options
| author | Sebastien Zwickert <dilaroga@gmail.com> | 2015-07-11 13:23:21 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2015-08-03 10:12:10 +0200 |
| commit | 11d923d41412223ed255f31489222321b11d0397 (patch) | |
| tree | 79c8ec8438b9cfe8be952a2e6aba9e5e0797f669 /libavcodec/h264_slice.c | |
| parent | 127203ba5a0b9fab652a5095e52f3d247abc98e5 (diff) | |
avcodec: add new Videotoolbox hwaccel.
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 9a8319bce0..b088392576 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -868,6 +868,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) CONFIG_H264_D3D11VA_HWACCEL + \ CONFIG_H264_VAAPI_HWACCEL + \ (CONFIG_H264_VDA_HWACCEL * 2) + \ + CONFIG_H264_VIDEOTOOLBOX_HWACCEL + \ CONFIG_H264_VDPAU_HWACCEL) enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts; const enum AVPixelFormat *choices = pix_fmts; @@ -948,6 +949,9 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) *fmt++ = AV_PIX_FMT_VDA_VLD; *fmt++ = AV_PIX_FMT_VDA; #endif +#if CONFIG_H264_VIDEOTOOLBOX_HWACCEL + *fmt++ = AV_PIX_FMT_VIDEOTOOLBOX; +#endif if (h->avctx->codec->pix_fmts) choices = h->avctx->codec->pix_fmts; else if (h->avctx->color_range == AVCOL_RANGE_JPEG) |