diff options
| author | James Almer <jamrial@gmail.com> | 2017-12-25 19:40:42 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-12-25 23:18:41 -0300 |
| commit | 89f704cabab446afc8ba6ecea76714a51b1df32b (patch) | |
| tree | 234fe8471deba5874fbb4d12e7a74b3de3f65113 | |
| parent | 613f789c19153edadb1fcc11866192f6b296ee58 (diff) | |
| download | ffmpeg-89f704cabab446afc8ba6ecea76714a51b1df32b.tar.gz | |
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 <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/libx264.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index e2455e18de..2d36c5e566 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); |