diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 16:18:02 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 16:18:02 +0200 |
| commit | dd8a4b0f8c39803b6a33f4b4bc836cfc66222370 (patch) | |
| tree | 32fb5e4b29968caef33ecd449d25288604556dfc /ffmpeg_opt.c | |
| parent | 866a4174dba066780c7be1ebdaa0152161cdf3e0 (diff) | |
| parent | fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8 (diff) | |
Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'
* commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8':
avconv: add support for Intel QSV-accelerated transcoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 7139114e62..0da1ffd1eb 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -79,6 +79,9 @@ const HWAccel hwaccels[] = { #if CONFIG_VIDEOTOOLBOX { "videotoolbox", videotoolbox_init, HWACCEL_VIDEOTOOLBOX, AV_PIX_FMT_VIDEOTOOLBOX }, #endif +#if CONFIG_LIBMFX + { "qsv", qsv_init, HWACCEL_QSV, AV_PIX_FMT_QSV }, +#endif { 0 }, }; |