Compare commits

...

2 Commits

Author SHA1 Message Date
James Almer
1cae2f002d avcodec/libx264: fix usage of AVComponentDescriptor depth field
AVComponentDescriptor.depth is not available in release/2.4

This fixes compilation of the libx264 wrapper.

Signed-off-by: James Almer <jamrial@gmail.com>
2018-01-31 22:39:53 -03:00
Michael Niedermayer
2633ac3a96 avcodec/libx264: remove NV21, its not supported
Regression introduced in 8d75aa8d79

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-31 16:45:54 +01:00

View File

@@ -398,7 +398,7 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4->params.i_log_level = X264_LOG_DEBUG;
x4->params.i_csp = convert_pix_fmt(avctx->pix_fmt);
#if X264_BUILD >= 153
x4->params.i_bitdepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth;
x4->params.i_bitdepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1;
#endif
OPT_STR("weightp", x4->wpredp);
@@ -747,9 +747,6 @@ static const enum AVPixelFormat pix_fmts_all[] = {
AV_PIX_FMT_YUVJ444P,
AV_PIX_FMT_NV12,
AV_PIX_FMT_NV16,
#ifdef X264_CSP_NV21
AV_PIX_FMT_NV21,
#endif
AV_PIX_FMT_YUV420P10,
AV_PIX_FMT_YUV422P10,
AV_PIX_FMT_YUV444P10,