aboutsummaryrefslogtreecommitdiff
path: root/textproc/libextractor
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2018-04-27 14:37:28 +0000
committerJan Beich <jbeich@FreeBSD.org>2018-04-27 14:37:28 +0000
commita942be89f54592aa52fde9e0bfe657daad0af058 (patch)
tree44a53aaf7157e8c02fa71b8b12268ed532d6f377 /textproc/libextractor
parentbe39639ce8e40878ba49e0b8fd8a79d68e244487 (diff)
downloadports-a942be89f54592aa52fde9e0bfe657daad0af058.tar.gz
ports-a942be89f54592aa52fde9e0bfe657daad0af058.zip
textproc/libextractor: unbreak with ffmpeg 4.0
thumbnailffmpeg_extractor.c:426:29: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE' unsigned char padded_data[PADDED_BUFFER_SIZE]; ^ thumbnailffmpeg_extractor.c:99:43: note: expanded from macro 'PADDED_BUFFER_SIZE' #define PADDED_BUFFER_SIZE (BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE) ^ thumbnailffmpeg_extractor.c:479:38: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE' memset (&padded_data[iret], 0, PADDED_BUFFER_SIZE - iret); ^ thumbnailffmpeg_extractor.c:99:43: note: expanded from macro 'PADDED_BUFFER_SIZE' #define PADDED_BUFFER_SIZE (BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE) ^ PR: 227726
Notes
Notes: svn path=/head/; revision=468431
Diffstat (limited to 'textproc/libextractor')
-rw-r--r--textproc/libextractor/files/patch-ffmpeg299
1 files changed, 9 insertions, 0 deletions
diff --git a/textproc/libextractor/files/patch-ffmpeg29 b/textproc/libextractor/files/patch-ffmpeg29
index ccdccea70483..7d11c4178efe 100644
--- a/textproc/libextractor/files/patch-ffmpeg29
+++ b/textproc/libextractor/files/patch-ffmpeg29
@@ -24,6 +24,15 @@ Applied-Upstream: commit: r35548:r35549 and r36975
/**
* Set to 1 to enable debug output.
*/
+@@ -82,7 +96,7 @@
+ /**
+ * Number of bytes to feed to libav in one go, with padding (padding is zeroed).
+ */
+-#define PADDED_BUFFER_SIZE (BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE)
++#define PADDED_BUFFER_SIZE (BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE)
+
+ /**
+ * Global handle to MAGIC data.
@@ -153,7 +167,7 @@
static size_t
create_thumbnail (int src_width, int src_height,