ffmpeg | branch: release/3.4 | James Almer <jamr...@gmail.com> | Mon Dec 25 19:40:42 2017 -0300| [31d6f3df25eea5bece145ad01f8a089a3005ca84] | committer: James Almer
avcodec/libx264: use the pixfmt descriptor to check for high bit depths The x264_bit_depth constant has been removed in newer x264 builds. Signed-off-by: James Almer <jamr...@gmail.com> (cherry picked from commit 89f704cabab446afc8ba6ecea76714a51b1df32b) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31d6f3df25eea5bece145ad01f8a089a3005ca84 --- libavcodec/libx264.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index b11ede6198..6764c045e7 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -272,6 +272,7 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, int *got_packet) { X264Context *x4 = ctx->priv_data; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(ctx->pix_fmt); x264_nal_t *nal; int nnal, i, ret; x264_picture_t pic_out = {0}; @@ -279,7 +280,7 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, x264_picture_init( &x4->pic ); x4->pic.img.i_csp = x4->params.i_csp; - if (x264_bit_depth > 8) + if (desc->comp[0].depth > 8) x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH; x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
