Date: Tue, 24 Apr 2018 13:57:04 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468206 - head/audio/moc/files Message-ID: <201804241357.w3ODv4oR031603@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Apr 24 13:57:04 2018 New Revision: 468206 URL: https://svnweb.freebsd.org/changeset/ports/468206 Log: audio/moc: unbreak with ffmpeg 4.0 ffmpeg.c:996:34: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED' if (data->codec->capabilities & CODEC_CAP_TRUNCATED) ^ ffmpeg.c:997:23: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED' data->enc->flags |= CODEC_FLAG_TRUNCATED; ^ ffmpeg.c:1028:34: error: use of undeclared identifier 'CODEC_CAP_DELAY' if (data->codec->capabilities & CODEC_CAP_DELAY) ^ PR: 227726 Obtained from: Greg V Added: head/audio/moc/files/ head/audio/moc/files/patch-decoder__plugins_ffmpeg_ffmpeg.c (contents, props changed) Added: head/audio/moc/files/patch-decoder__plugins_ffmpeg_ffmpeg.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/moc/files/patch-decoder__plugins_ffmpeg_ffmpeg.c Tue Apr 24 13:57:04 2018 (r468206) @@ -0,0 +1,32 @@ +ffmpeg.c:996:34: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED' + if (data->codec->capabilities & CODEC_CAP_TRUNCATED) + ^ +ffmpeg.c:997:23: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED' + data->enc->flags |= CODEC_FLAG_TRUNCATED; + ^ +ffmpeg.c:1028:34: error: use of undeclared identifier 'CODEC_CAP_DELAY' + if (data->codec->capabilities & CODEC_CAP_DELAY) + ^ + +--- decoder_plugins/ffmpeg/ffmpeg.c.orig 2016-11-16 00:54:37 UTC ++++ decoder_plugins/ffmpeg/ffmpeg.c +@@ -993,8 +993,8 @@ static void *ffmpeg_open (const char *file) + #endif + + set_downmixing (data); +- if (data->codec->capabilities & CODEC_CAP_TRUNCATED) +- data->enc->flags |= CODEC_FLAG_TRUNCATED; ++ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED; + + #ifdef HAVE_AVCODEC_OPEN2 + if (avcodec_open2 (data->enc, data->codec, NULL) < 0) +@@ -1025,7 +1025,7 @@ static void *ffmpeg_open (const char *file) + + data->sample_width = sfmt_Bps (data->fmt); + +- if (data->codec->capabilities & CODEC_CAP_DELAY) ++ if (data->codec->capabilities & AV_CODEC_CAP_DELAY) + data->delay = true; + data->seek_broken = is_seek_broken (data); + data->timing_broken = is_timing_broken (data->ic);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804241357.w3ODv4oR031603>