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

avcodec/libx264: use the pixfmt descriptor to check for high bit depths

Browse Source 
The x264_bit_depth constant has been removed in newer x264 builds.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-12-25 19:40:42 -03:00
parent 613f789c19
commit 89f704caba
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/libx264.c
View File

@@ -272,6 +272,7 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame,
int *got_packet) int *got_packet)
{ {
X264Context *x4 = ctx->priv_data; X264Context *x4 = ctx->priv_data;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(ctx->pix_fmt);
x264_nal_t *nal; x264_nal_t *nal;
int nnal, i, ret; int nnal, i, ret;
x264_picture_t pic_out = {0}; 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 ); x264_picture_init( &x4->pic );
x4->pic.img.i_csp = x4->params.i_csp; 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_csp |= X264_CSP_HIGH_DEPTH;
x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt); x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt);