1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
diff -Naur ffmpeg-1.2.12.orig/libavcodec/libx264.c ffmpeg-1.2.12/libavcodec/libx264.c
--- ffmpeg-1.2.12.orig/libavcodec/libx264.c 2018-08-26 00:25:51.142481000 +0200
+++ ffmpeg-1.2.12/libavcodec/libx264.c 2018-08-26 00:27:16.508999660 +0200
@@ -160,7 +160,7 @@
x264_picture_init( &x4->pic );
x4->pic.img.i_csp = x4->params.i_csp;
- if (desc->comp[0].depth > 8)
+ if (desc->comp[0].depth_minus1 > 8)
x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH;
x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt);
@@ -491,7 +491,7 @@
x4->params.i_width = avctx->width;
x4->params.i_height = avctx->height;
#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;
#endif
av_reduce(&sw, &sh, avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den, 4096);
x4->params.vui.i_sar_width = sw;
@@ -596,8 +596,6 @@
AV_PIX_FMT_YUV422P10,
AV_PIX_FMT_YUV444P10,
AV_PIX_FMT_NV12,
- AV_PIX_FMT_NV16,
- AV_PIX_FMT_NV20,
#ifdef X264_CSP_NV21
AV_PIX_FMT_NV21,
#endif
|