svn commit: r468853 - in head/net/freeswitch: . files
Jan Beich
jbeich at FreeBSD.org
Wed May 2 16:34:00 UTC 2018
Author: jbeich
Date: Wed May 2 16:33:59 2018
New Revision: 468853
URL: https://svnweb.freebsd.org/changeset/ports/468853
Log:
net/freeswitch: unbreak with ffmpeg 4.0
avcodec.c:194:40: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
static uint8_t ff_input_buffer_padding[FF_INPUT_BUFFER_PADDING_SIZE] = { 0 };
^
avformat.c:471:14: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER'
c->flags|=CODEC_FLAG_LOOP_FILTER; // flags=+loop
^
avformat.c:477:47: error: use of undeclared identifier 'ME_HEX'
av_opt_set_int(c->priv_data, "motion_est", ME_HEX, 0);
^
avformat.c:553:15: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
c->flags |= CODEC_FLAG_GLOBAL_HEADER;
^
avformat.c:638:31: error: use of undeclared identifier 'CODEC_CAP_VARIABLE_FRAME_SIZE'
if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
^
PR: 227726
Reported by: antoine (via exp-run)
Added:
head/net/freeswitch/files/patch-ffmpeg4 (contents, props changed)
Modified:
head/net/freeswitch/Makefile (contents, props changed)
Modified: head/net/freeswitch/Makefile
==============================================================================
--- head/net/freeswitch/Makefile Wed May 2 16:25:19 2018 (r468852)
+++ head/net/freeswitch/Makefile Wed May 2 16:33:59 2018 (r468853)
@@ -64,7 +64,6 @@ ENGLISH_DESC= US English Language Sounds
FRENCH_DESC= French Canadian Language Sounds
RUSSIAN_DESC= Russian Language Sounds
-ALL_MODULES_BROKEN= fails to build with ffmpeg 4.0
ALL_MODULES_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa \
${LOCALBASE}/bin/aclocal:devel/automake
ALL_MODULES_CONFLICTS_BUILD= apr
Added: head/net/freeswitch/files/patch-ffmpeg4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/freeswitch/files/patch-ffmpeg4 Wed May 2 16:33:59 2018 (r468853)
@@ -0,0 +1,63 @@
+avcodec.c:194:40: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
+static uint8_t ff_input_buffer_padding[FF_INPUT_BUFFER_PADDING_SIZE] = { 0 };
+ ^
+avformat.c:471:14: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER'
+ c->flags|=CODEC_FLAG_LOOP_FILTER; // flags=+loop
+ ^
+avformat.c:477:47: error: use of undeclared identifier 'ME_HEX'
+ av_opt_set_int(c->priv_data, "motion_est", ME_HEX, 0);
+ ^
+avformat.c:553:15: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
+ c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ ^
+avformat.c:638:31: error: use of undeclared identifier 'CODEC_CAP_VARIABLE_FRAME_SIZE'
+ if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
+ ^
+
+--- src/mod/applications/mod_av/avcodec.c.orig 2017-07-13 12:07:30 UTC
++++ src/mod/applications/mod_av/avcodec.c
+@@ -191,7 +191,7 @@ typedef struct h264_codec_context_s {
+ int hw_encoder;
+ } h264_codec_context_t;
+
+-static uint8_t ff_input_buffer_padding[FF_INPUT_BUFFER_PADDING_SIZE] = { 0 };
++static uint8_t ff_input_buffer_padding[AV_INPUT_BUFFER_PADDING_SIZE] = { 0 };
+
+ static switch_status_t buffer_h264_nalu(h264_codec_context_t *context, switch_frame_t *frame)
+ {
+--- src/mod/applications/mod_av/avformat.c.orig 2017-07-13 12:07:30 UTC
++++ src/mod/applications/mod_av/avformat.c
+@@ -468,13 +468,13 @@ GCC_DIAG_ON(deprecated-declarations)
+ c->ticks_per_frame = 2;
+
+
+- c->flags|=CODEC_FLAG_LOOP_FILTER; // flags=+loop
++ c->flags|=AV_CODEC_FLAG_LOOP_FILTER; // flags=+loop
+ c->me_cmp|= 1; // cmp=+chroma, where CHROMA = 1
+ c->me_range = 16; // me_range=16
+ c->max_b_frames = 3; // bf=3
+
+ av_opt_set_int(c->priv_data, "b_strategy", 1, 0);
+- av_opt_set_int(c->priv_data, "motion_est", ME_HEX, 0);
++ av_opt_set(c->priv_data, "motion_est", "hex", 0);
+ av_opt_set_int(c->priv_data, "coder", 1, 0);
+
+ switch (mm->vprofile) {
+@@ -550,7 +550,7 @@ GCC_DIAG_ON(deprecated-declarations)
+
+ /* Some formats want stream headers to be separate. */
+ if (fc->oformat->flags & AVFMT_GLOBALHEADER) {
+- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ }
+
+ return SWITCH_STATUS_SUCCESS;
+@@ -635,7 +635,7 @@ GCC_DIAG_ON(deprecated-declarations)
+ mst->frame->format = AV_SAMPLE_FMT_S16;
+ mst->frame->channel_layout = c->channel_layout;
+
+- if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
++ if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
+ mst->frame->nb_samples = 10000;
+ } else {
+ mst->frame->nb_samples = c->frame_size;
More information about the svn-ports-head
mailing list