[FFmpeg-devel] [PATCH 2/3] {configure, avcodec/libx264}: remove separate x264_csp_bgr check

[Jan Ekström]

On Fri, Jul 2, 2021 at 1:09 AM James Almer <jamrial at gmail.com> wrote:
>
> On 7/1/2021 6:54 PM, Jan Ekström wrote:
> > We already require X264_BUILD >= 118, which includes an unconditional
> > definition of X264_CSP_BGR in itself, thus making this check
> > effectively always true.
> > ---
> >   configure            | 3 ---
> >   libavcodec/libx264.c | 7 +------
> >   2 files changed, 1 insertion(+), 9 deletions(-)
> >
> > diff --git a/configure b/configure
> > index ab27220688..9e8d219449 100755
> > --- a/configure
> > +++ b/configure
> > @@ -3316,8 +3316,6 @@ libwebp_anim_encoder_deps="libwebp"
> >   libx262_encoder_deps="libx262"
> >   libx264_encoder_deps="libx264"
> >   libx264_encoder_select="atsc_a53"
> > -libx264rgb_encoder_deps="libx264 x264_csp_bgr"
> > -libx264rgb_encoder_select="libx264_encoder"
>
> Without this, libx264rgb_encoder will be enabled even when libx264 is
> not present.
> Just remove the x264_csp_bgr dep but kept the other dep, and the select.
>

I just re-tested and yes, I did forget that libavcodec/allcodecs.c
lines were not definitions but external references. As I saw no ifdefs
in allcodecs, I thought the now-unused CONFIG_LIBX264RGB_ENCODER
defines would cause no harm. How wrong I was :)

Will do this change after I have had some sleep.

Jan