On Mon, 9 Oct 2017 12:40:41 +0100
Mark Thompson <sw at jkqxz.net> wrote:
> On 09/10/17 08:49, Jun Zhao wrote:
> > V3: Remove hwaccel_lax_profile_check opt, and add new pre-stream
> > hwaccel_flags option
> >
>
> > From 2b1585fd6e6e68c81761ace0a8503385067086e0 Mon Sep 17 00:00:00 2001
> > From: Jun Zhao <jun.zhao at intel.com>
> > Date: Mon, 9 Oct 2017 02:13:14 -0400
> > Subject: [V3 1/4] ffmpeg: remove hwaccel_lax_profile_check opt.
> >
> > remove hwaccel_lax_profile_check, will use pre-stream hwaccel_flags
> > option.
> >
> > Signed-off-by: Jun Zhao <jun.zhao at intel.com>
> > ---
> > fftools/ffmpeg.h | 1 -
> > fftools/ffmpeg_opt.c | 3 ---
> > 2 files changed, 4 deletions(-)
> >
> > diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
> > index f6c76bcc55..888f77223a 100644
> > --- a/fftools/ffmpeg.h
> > +++ b/fftools/ffmpeg.h
> > @@ -624,7 +624,6 @@ extern const AVIOInterruptCB int_cb;
> >
> > extern const OptionDef options[];
> > extern const HWAccel hwaccels[];
> > -extern int hwaccel_lax_profile_check;
> > extern AVBufferRef *hw_device_ctx;
> > #if CONFIG_QSV
> > extern char *qsv_device;
> > diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
> > index 100fa76e46..500920326b 100644
> > --- a/fftools/ffmpeg_opt.c
> > +++ b/fftools/ffmpeg_opt.c
> > @@ -100,7 +100,6 @@ const HWAccel hwaccels[] = {
> > #endif
> > { 0 },
> > };
> > -int hwaccel_lax_profile_check = 0;
> > AVBufferRef *hw_device_ctx;
> > HWDevice *filter_hw_device;
> >
> > @@ -3640,8 +3639,6 @@ const OptionDef options[] = {
> > { "autorotate", HAS_ARG | OPT_BOOL | OPT_SPEC |
> > OPT_EXPERT | OPT_INPUT, { .off = OFFSET(autorotate) },
> > "automatically insert correct rotate filters" },
> > - { "hwaccel_lax_profile_check", OPT_BOOL | OPT_EXPERT, { &hwaccel_lax_profile_check},
> > - "attempt to decode anyway if HW accelerated decoder's supported profiles do not exactly match the stream" },
> >
> > /* audio options */
> > { "aframes", OPT_AUDIO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_audio_frames },
> > --
> > 2.11.0
> >
>
> Would anyone else care to comment on whether we are allowed to do this? I realise the option lost any effect some time ago, but I was waiting for the version bump to actually remove it.
That's a good question. Unfortunately, I'd guess "maybe not" without
deprecation. But not sure.