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
31
32
33
34
35
36
37
38
39
|
From bd59735b4f97ae9dff864debdecc2318b0cb8f94 Mon Sep 17 00:00:00 2001
From: Dan Dennedy <dan@dennedy.org>
Date: Mon, 12 Feb 2018 12:21:19 -0800
Subject: [PATCH] Fix compile error with libav.
---
src/modules/avformat/producer_avformat.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index 214c8b325..7de997cc2 100644
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -1,6 +1,6 @@
/*
* producer_avformat.c -- avformat producer
- * Copyright (C) 2003-2017 Meltytech, LLC
+ * Copyright (C) 2003-2018 Meltytech, LLC
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -1266,7 +1266,7 @@ static int pick_av_pixel_format( int *pix_fmt )
return 0;
}
-#if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
+#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 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 LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
+#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
{
int i, c;
struct sliced_pix_fmt_conv_t ctx =
|
