diff options
author | Jan Ekström <jeebjp@gmail.com> | 2021-07-01 23:57:51 +0300 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2021-07-12 12:07:10 +0300 |
commit | f32f56468c6caa03f4ebbf6cf58b2bb7bc775216 (patch) | |
tree | 28d3edd481f16b7ed4e6adcc2e16381abc5f0b3e /libavcodec | |
parent | 25d28f297b755d3cb6a3e036a1e251148d0e4d5c (diff) |
{configure,avcodec/libx264}: remove separate x264_csp_bgr check
We already require X264_BUILD >= 118, which includes an unconditional
definition of X264_CSP_BGR in itself, thus making this check
effectively always true.
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/libx264.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 4b905bf9da..9afaf19547 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -553,7 +553,6 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) case AV_PIX_FMT_YUVJ444P: case AV_PIX_FMT_YUV444P9: case AV_PIX_FMT_YUV444P10: return X264_CSP_I444; -#if CONFIG_LIBX264RGB_ENCODER case AV_PIX_FMT_BGR0: return X264_CSP_BGRA; case AV_PIX_FMT_BGR24: @@ -561,7 +560,6 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) case AV_PIX_FMT_RGB24: return X264_CSP_RGB; -#endif case AV_PIX_FMT_NV12: return X264_CSP_NV12; case AV_PIX_FMT_NV16: case AV_PIX_FMT_NV20: return X264_CSP_NV16; |