diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-17 16:46:44 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-17 16:47:05 +0000 |
| commit | 6b706ce85fa56564986211b99d34e269066ca3d9 (patch) | |
| tree | 62e80669e7751c953dbdf923d9c44a88b62f9761 /ffmpeg_opt.c | |
| parent | d779d8d771c0a4c3d7bc38ac49bfed3ea3a2e6ed (diff) | |
| parent | bd49be885e9ad6bae599c54473ba2fa2957eb140 (diff) | |
| download | ffmpeg-6b706ce85fa56564986211b99d34e269066ca3d9.tar.gz | |
Merge commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140'
* commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140':
avconv_vdpau: use the hwcontext API to simplify code
Tested-by: wm4
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index bc8355e2bf..edbc4a0efe 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -3361,9 +3361,6 @@ const OptionDef options[] = { { "hwaccel_device", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT | OPT_SPEC | OPT_INPUT, { .off = OFFSET(hwaccel_devices) }, "select a device for HW acceleration", "devicename" }, -#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 |