virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

{configure,avcodec/libx264}: remove separate x264_csp_bgr check

Browse Source 
We already require X264_BUILD >= 118, which includes an unconditional
definition of X264_CSP_BGR in itself, thus making this check
effectively always true.
This commit is contained in:
Jan Ekström
2021-07-01 23:57:51 +03:00
parent 25d28f297b
commit f32f56468c
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@@ -3316,7 +3316,7 @@ libwebp_anim_encoder_deps="libwebp"
libx262_encoder_deps="libx262" libx262_encoder_deps="libx262"
libx264_encoder_deps="libx264" libx264_encoder_deps="libx264"
libx264_encoder_select="atsc_a53" libx264_encoder_select="atsc_a53"
libx264rgb_encoder_deps="libx264 x264_csp_bgr" libx264rgb_encoder_deps="libx264"
libx264rgb_encoder_select="libx264_encoder" libx264rgb_encoder_select="libx264_encoder"
libx265_encoder_deps="libx265" libx265_encoder_deps="libx265"
libxavs_encoder_deps="libxavs" libxavs_encoder_deps="libxavs"
@@ -6529,7 +6529,6 @@ enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x
{ require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" && { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" &&
warn "using libx264 without pkg-config"; } } && warn "using libx264 without pkg-config"; } } &&
require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && require_cpp_condition libx264 x264.h "X264_BUILD >= 118" &&
check_cpp_condition x264_csp_bgr x264.h "X264_CSP_BGR" &&
check_cpp_condition libx262 x264.h "X264_MPEG2" check_cpp_condition libx262 x264.h "X264_MPEG2"
enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get &&
require_cpp_condition libx265 x265.h "X265_BUILD >= 70" require_cpp_condition libx265 x265.h "X265_BUILD >= 70"

2
libavcodec/libx264.c
View File

@@ -553,7 +553,6 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt)
case AV_PIX_FMT_YUVJ444P: case AV_PIX_FMT_YUVJ444P:
case AV_PIX_FMT_YUV444P9: case AV_PIX_FMT_YUV444P9:
case AV_PIX_FMT_YUV444P10: return X264_CSP_I444; case AV_PIX_FMT_YUV444P10: return X264_CSP_I444;
#if CONFIG_LIBX264RGB_ENCODER
case AV_PIX_FMT_BGR0: case AV_PIX_FMT_BGR0:
return X264_CSP_BGRA; return X264_CSP_BGRA;
case AV_PIX_FMT_BGR24: case AV_PIX_FMT_BGR24:
@@ -561,7 +560,6 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt)
case AV_PIX_FMT_RGB24: case AV_PIX_FMT_RGB24:
return X264_CSP_RGB; return X264_CSP_RGB;
#endif
case AV_PIX_FMT_NV12: return X264_CSP_NV12; case AV_PIX_FMT_NV12: return X264_CSP_NV12;
case AV_PIX_FMT_NV16: case AV_PIX_FMT_NV16:
case AV_PIX_FMT_NV20: return X264_CSP_NV16; case AV_PIX_FMT_NV20: return X264_CSP_NV16;