We already require X264_BUILD >= 118, which includes an unconditional definition of X264_CSP_BGR in itself, thus making this check effectively always true.
Unified · Split
| @@ -3316,7 +3316,7 @@ libwebp_anim_encoder_deps="libwebp" · 3315 unmodified lines | |||
| 3316 | libx262_encoder_deps="libx262" | 3316 | libx262_encoder_deps="libx262" |
| 3317 | libx264_encoder_deps="libx264" | 3317 | libx264_encoder_deps="libx264" |
| 3318 | libx264_encoder_select="atsc_a53" | 3318 | libx264_encoder_select="atsc_a53" |
| 3319 | libx264rgb_encoder_deps="libx264 x264_csp_bgr" | 3319 | libx264rgb_encoder_deps="libx264" |
| 3320 | libx264rgb_encoder_select="libx264_encoder" | 3320 | libx264rgb_encoder_select="libx264_encoder" |
| 3321 | libx265_encoder_deps="libx265" | 3321 | libx265_encoder_deps="libx265" |
| 3322 | libxavs_encoder_deps="libxavs" | 3322 | libxavs_encoder_deps="libxavs" |
| @@ -6529,7 +6529,6 @@ enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x · 3206 unmodified lines | |||
| 6529 | { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" && | 6529 | { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" && |
| 6530 | warn "using libx264 without pkg-config"; } } && | 6530 | warn "using libx264 without pkg-config"; } } && |
| 6531 | require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && | 6531 | require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && |
| 6532 | check_cpp_condition x264_csp_bgr x264.h "X264_CSP_BGR" && | ||
| 6533 | check_cpp_condition libx262 x264.h "X264_MPEG2" | 6532 | check_cpp_condition libx262 x264.h "X264_MPEG2" |
| 6534 | enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && | 6533 | enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && |
| 6535 | require_cpp_condition libx265 x265.h "X265_BUILD >= 70" | 6534 | require_cpp_condition libx265 x265.h "X265_BUILD >= 70" |
| @@ -553,7 +553,6 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) · 552 unmodified lines | |||
| 553 | case AV_PIX_FMT_YUVJ444P: | 553 | case AV_PIX_FMT_YUVJ444P: |
| 554 | case AV_PIX_FMT_YUV444P9: | 554 | case AV_PIX_FMT_YUV444P9: |
| 555 | case AV_PIX_FMT_YUV444P10: return X264_CSP_I444; | 555 | case AV_PIX_FMT_YUV444P10: return X264_CSP_I444; |
| 556 | #if CONFIG_LIBX264RGB_ENCODER | ||
| 557 | case AV_PIX_FMT_BGR0: | 556 | case AV_PIX_FMT_BGR0: |
| 558 | return X264_CSP_BGRA; | 557 | return X264_CSP_BGRA; |
| 559 | case AV_PIX_FMT_BGR24: | 558 | case AV_PIX_FMT_BGR24: |
| @@ -561,7 +560,6 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) · 1 unmodified line | |||
| 561 | 560 | ||
| 562 | case AV_PIX_FMT_RGB24: | 561 | case AV_PIX_FMT_RGB24: |
| 563 | return X264_CSP_RGB; | 562 | return X264_CSP_RGB; |
| 564 | #endif | ||
| 565 | case AV_PIX_FMT_NV12: return X264_CSP_NV12; | 563 | case AV_PIX_FMT_NV12: return X264_CSP_NV12; |
| 566 | case AV_PIX_FMT_NV16: | 564 | case AV_PIX_FMT_NV16: |
| 567 | case AV_PIX_FMT_NV20: return X264_CSP_NV16; | 565 | case AV_PIX_FMT_NV20: return X264_CSP_NV16; |