diff options
| author | Florian Franzmann | 2018-01-30 14:17:19 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2018-02-01 20:30:43 +0100 |
| commit | cd8d7a466967ade8f137c2f3d0f32e0c38d82ee9 (patch) | |
| tree | badadc24062f4e38ec90a80ac33d9d222e4706cb /audio-players | |
| parent | f3c8931c86f42170fa8e00addd93c4c914964f34 (diff) | |
audio-players/moc: fix build with recent versions of ffmpeg
Diffstat (limited to 'audio-players')
| -rw-r--r-- | audio-players/moc/0001-fix-build-against-recent-versions-of-ffmpeg.patch | 36 | ||||
| -rw-r--r-- | audio-players/moc/HISTORY | 4 | ||||
| -rwxr-xr-x | audio-players/moc/PRE_BUILD | 2 |
3 files changed, 42 insertions, 0 deletions
diff --git a/audio-players/moc/0001-fix-build-against-recent-versions-of-ffmpeg.patch b/audio-players/moc/0001-fix-build-against-recent-versions-of-ffmpeg.patch new file mode 100644 index 0000000000..af6baed629 --- /dev/null +++ b/audio-players/moc/0001-fix-build-against-recent-versions-of-ffmpeg.patch @@ -0,0 +1,36 @@ +From 221d7326d2c011917d5498be81ab87780f602371 Mon Sep 17 00:00:00 2001 +From: Florian Franzmann <bwlf@bandrate.org> +Date: Tue, 30 Jan 2018 14:14:40 +0100 +Subject: [PATCH] fix build against recent versions of ffmpeg + +--- + decoder_plugins/ffmpeg/ffmpeg.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/decoder_plugins/ffmpeg/ffmpeg.c b/decoder_plugins/ffmpeg/ffmpeg.c +index 7b90493..bbbe148 100644 +--- a/decoder_plugins/ffmpeg/ffmpeg.c ++++ b/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); +-- +2.15.1 + diff --git a/audio-players/moc/HISTORY b/audio-players/moc/HISTORY index 524e246fb3..77f1ba58c9 100644 --- a/audio-players/moc/HISTORY +++ b/audio-players/moc/HISTORY @@ -1,3 +1,7 @@ +2018-01-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * PRE_BUILD, 0001-fix-build-against-recent-versions-of-ffmpeg.patch: fix + build with recent versions of ffmpeg + 2017-01-07 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 2.5.2 diff --git a/audio-players/moc/PRE_BUILD b/audio-players/moc/PRE_BUILD index 98788adf5f..481a08f0e7 100755 --- a/audio-players/moc/PRE_BUILD +++ b/audio-players/moc/PRE_BUILD @@ -1,4 +1,6 @@ default_pre_build && cd ${SOURCE_DIRECTORY} && +patch -p1 < "$SPELL_DIRECTORY/0001-fix-build-against-recent-versions-of-ffmpeg.patch" && + autoreconf -fi |