31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 56e3affe1ff425d979ea9f2a5e086d769852c3fc Mon Sep 17 00:00:00 2001
|
|
From: Dan Dennedy <dan@dennedy.org>
|
|
Date: Fri, 16 Feb 2018 09:55:29 -0800
|
|
Subject: [PATCH] Fix compile error with libav.
|
|
|
|
---
|
|
src/modules/avformat/producer_avformat.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
|
|
index 7de997cc2..2fafd00e8 100644
|
|
--- a/src/modules/avformat/producer_avformat.c
|
|
+++ b/src/modules/avformat/producer_avformat.c
|
|
@@ -1266,7 +1266,7 @@ static int pick_av_pixel_format( int *pix_fmt )
|
|
return 0;
|
|
}
|
|
|
|
-#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
|
|
+#if defined(FFUDIV) && (LIBSWSCALE_VERSION_INT >= ((3<<16)+(1<<8)+101))
|
|
struct sliced_pix_fmt_conv_t
|
|
{
|
|
int width, height, slice_w;
|
|
@@ -1461,7 +1461,7 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
|
|
sws_freeContext( context );
|
|
}
|
|
else
|
|
-#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
|
|
+#if defined(FFUDIV) && (LIBSWSCALE_VERSION_INT >= ((3<<16)+(1<<8)+101))
|
|
{
|
|
int i, c;
|
|
struct sliced_pix_fmt_conv_t ctx =
|