From fc88229c648edff6bda5e2e3d2954aaded6ba48e Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Tue, 24 Apr 2018 13:57:04 +0000 Subject: 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 --- .../files/patch-decoder__plugins_ffmpeg_ffmpeg.c | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 audio/moc/files/patch-decoder__plugins_ffmpeg_ffmpeg.c (limited to 'audio/moc/files') diff --git a/audio/moc/files/patch-decoder__plugins_ffmpeg_ffmpeg.c b/audio/moc/files/patch-decoder__plugins_ffmpeg_ffmpeg.c new file mode 100644 index 000000000000..f5183d6d0d02 --- /dev/null +++ b/audio/moc/files/patch-decoder__plugins_ffmpeg_ffmpeg.c @@ -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); -- cgit v1.2.3