|
|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
Index: configure
|
|
|
|
|
--- configure.orig 2017-12-10 22:35:18.000000000 +0100
|
|
|
|
|
+++ configure 2018-01-12 16:48:34.730232000 +0100
|
|
|
|
|
--- configure.orig 2018-02-12 01:29:18.000000000 +0100
|
|
|
|
|
+++ configure 2018-02-12 09:37:19.529353000 +0100
|
|
|
|
|
@@ -5930,7 +5930,7 @@
|
|
|
|
|
enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
|
|
|
|
|
enabled libgme && { use_pkg_config libgme libgme gme/gme.h gme_new_emu ||
|
|
|
|
|
@ -50,74 +50,9 @@ Index: configure
|
|
|
|
|
}
|
|
|
|
|
if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then
|
|
|
|
|
die "libvpx enabled but no supported decoders found"
|
|
|
|
|
Index: libavcodec/libx264.c
|
|
|
|
|
--- libavcodec/libx264.c.orig 2017-12-10 22:35:08.000000000 +0100
|
|
|
|
|
+++ libavcodec/libx264.c 2018-01-12 17:08:00.999026000 +0100
|
|
|
|
|
@@ -279,7 +279,7 @@
|
|
|
|
|
|
|
|
|
|
x264_picture_init( &x4->pic );
|
|
|
|
|
x4->pic.img.i_csp = x4->params.i_csp;
|
|
|
|
|
- if (x264_bit_depth > 8)
|
|
|
|
|
+ if (X264_BIT_DEPTH > 8)
|
|
|
|
|
x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH;
|
|
|
|
|
x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt);
|
|
|
|
|
|
|
|
|
|
@@ -739,6 +739,9 @@
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
+#endif
|
|
|
|
|
av_reduce(&sw, &sh, avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den, 4096);
|
|
|
|
|
x4->params.vui.i_sar_width = sw;
|
|
|
|
|
x4->params.vui.i_sar_height = sh;
|
|
|
|
|
@@ -852,6 +855,24 @@
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+static const enum AVPixelFormat pix_fmts[] = {
|
|
|
|
|
+ AV_PIX_FMT_YUV420P,
|
|
|
|
|
+ AV_PIX_FMT_YUVJ420P,
|
|
|
|
|
+ AV_PIX_FMT_YUV422P,
|
|
|
|
|
+ AV_PIX_FMT_YUVJ422P,
|
|
|
|
|
+ AV_PIX_FMT_YUV444P,
|
|
|
|
|
+ AV_PIX_FMT_YUVJ444P,
|
|
|
|
|
+ AV_PIX_FMT_YUV420P10,
|
|
|
|
|
+ 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
|
|
|
|
|
+ AV_PIX_FMT_NONE
|
|
|
|
|
+};
|
|
|
|
|
static const enum AVPixelFormat pix_fmts_8bit[] = {
|
|
|
|
|
AV_PIX_FMT_YUV420P,
|
|
|
|
|
AV_PIX_FMT_YUVJ420P,
|
|
|
|
|
@@ -889,12 +910,14 @@
|
|
|
|
|
|
|
|
|
|
static av_cold void X264_init_static(AVCodec *codec)
|
|
|
|
|
{
|
|
|
|
|
- if (x264_bit_depth == 8)
|
|
|
|
|
+ if (X264_BIT_DEPTH == 8)
|
|
|
|
|
codec->pix_fmts = pix_fmts_8bit;
|
|
|
|
|
- else if (x264_bit_depth == 9)
|
|
|
|
|
+ else if (X264_BIT_DEPTH == 9)
|
|
|
|
|
codec->pix_fmts = pix_fmts_9bit;
|
|
|
|
|
- else if (x264_bit_depth == 10)
|
|
|
|
|
+ else if (X264_BIT_DEPTH == 10)
|
|
|
|
|
codec->pix_fmts = pix_fmts_10bit;
|
|
|
|
|
+ else /* X264_BIT_DEPTH == 0 */
|
|
|
|
|
+ codec->pix_fmts = pix_fmts;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define OFFSET(x) offsetof(X264Context, x)
|
|
|
|
|
Index: libavformat/tcp.c
|
|
|
|
|
--- libavformat/tcp.c.orig 2017-12-10 22:35:10.000000000 +0100
|
|
|
|
|
+++ libavformat/tcp.c 2018-01-12 16:48:34.730394000 +0100
|
|
|
|
|
--- libavformat/tcp.c.orig 2018-02-12 01:29:06.000000000 +0100
|
|
|
|
|
+++ libavformat/tcp.c 2018-02-12 09:37:19.530096000 +0100
|
|
|
|
|
@@ -31,6 +31,7 @@
|
|
|
|
|
#if HAVE_POLL_H
|
|
|
|
|
#include <poll.h>
|
|
|
|
|
|
