diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 04:34:01 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 04:44:28 +0400 |
| commit | 5460ab73d2e8169c54beda06e7cca762aee84a1f (patch) | |
| tree | 8c50adb34c4df34a90cba7bc14edc84fe8bd4f13 /ffmpeg_opt.c | |
| parent | 2856332719d8ec182523f7793bb0517aaac68e73 (diff) | |
| parent | 1839fafa951308237c4672ffd9a94f927b26eac7 (diff) | |
Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'
* commit '1839fafa951308237c4672ffd9a94f927b26eac7':
avconv: Support VDA hwaccel
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 5b6a26abbe..8e3873c807 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -70,6 +70,9 @@ const HWAccel hwaccels[] = { #if HAVE_DXVA2_LIB { "dxva2", dxva2_init, HWACCEL_DXVA2, AV_PIX_FMT_DXVA2_VLD }, #endif +#if CONFIG_VDA + { "vda", vda_init, HWACCEL_VDA, AV_PIX_FMT_VDA }, +#endif { 0 }, }; |