diff options
| author | Sebastien Zwickert | 2015-07-11 13:23:21 +0200 |
|---|---|---|
| committer | Clément Bœsch | 2015-08-03 10:12:10 +0200 |
| commit | 11d923d41412223ed255f31489222321b11d0397 (patch) | |
| tree | 79c8ec8438b9cfe8be952a2e6aba9e5e0797f669 /ffmpeg_opt.c | |
| parent | 127203ba5a0b9fab652a5095e52f3d247abc98e5 (diff) | |
avcodec: add new Videotoolbox hwaccel.
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index d912cb02b5..66a43b4093 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -74,7 +74,10 @@ const HWAccel hwaccels[] = { { "dxva2", dxva2_init, HWACCEL_DXVA2, AV_PIX_FMT_DXVA2_VLD }, #endif #if CONFIG_VDA - { "vda", vda_init, HWACCEL_VDA, AV_PIX_FMT_VDA }, + { "vda", videotoolbox_init, HWACCEL_VDA, AV_PIX_FMT_VDA }, +#endif +#if CONFIG_VIDEOTOOLBOX + { "videotoolbox", videotoolbox_init, HWACCEL_VIDEOTOOLBOX, AV_PIX_FMT_VIDEOTOOLBOX }, #endif { 0 }, }; @@ -3233,6 +3236,9 @@ const OptionDef options[] = { #if HAVE_VDPAU_X11 { "vdpau_api_ver", HAS_ARG | OPT_INT | OPT_EXPERT, { &vdpau_api_ver }, "" }, #endif +#if CONFIG_VDA || CONFIG_VIDEOTOOLBOX + { "videotoolbox_pixfmt", HAS_ARG | OPT_STRING | OPT_EXPERT, { &videotoolbox_pixfmt}, "" }, +#endif { "autorotate", HAS_ARG | OPT_BOOL | OPT_SPEC | OPT_EXPERT | OPT_INPUT, { .off = OFFSET(autorotate) }, "automatically insert correct rotate filters" }, |