ping, please help to merge the code if it's OK.
On Thu, Aug 15, 2019 at 09:23:45AM +0800, lance.lmw...@gmail.com wrote: > From: Limin Wang <lance.lmw...@gmail.com> > > videotoolbox and qsv have been defined by hw_type_names[] in hwcontext.c > > Fixes ticket #7464 > > Signed-off-by: Limin Wang <lance.lmw...@gmail.com> > --- > fftools/ffmpeg_opt.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c > index f5ca18a..8baa898 100644 > --- a/fftools/ffmpeg_opt.c > +++ b/fftools/ffmpeg_opt.c > @@ -66,12 +66,6 @@ > } > > 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 > #if CONFIG_CUVID > { "cuvid", cuvid_init, HWACCEL_CUVID, AV_PIX_FMT_CUDA }, > #endif > -- > 2.6.4 > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".