diff --git a/srcpkgs/moc/patches/ffmpeg4.patch b/srcpkgs/moc/patches/ffmpeg4.patch index 9beff381983..5353c148ab8 100644 --- a/srcpkgs/moc/patches/ffmpeg4.patch +++ b/srcpkgs/moc/patches/ffmpeg4.patch @@ -1,32 +1,31 @@ ---- a/decoder_plugins/ffmpeg/ffmpeg.c.orig 2018-05-11 12:48:29.897671514 +0200 -+++ b/decoder_plugins/ffmpeg/ffmpeg.c 2018-05-11 12:50:09.133692416 +0200 -@@ -984,7 +984,7 @@ - * FFmpeg/LibAV in use. For some versions this will be caught in - * *_find_stream_info() above and misreported as an unfound codec - * parameters error. */ -- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) { +--- a/decoder_plugins/ffmpeg/ffmpeg.c ++++ b/decoder_plugins/ffmpeg/ffmpeg.c +@@ -984,7 +984,7 @@ static void *ffmpeg_open (const char *fi + * FFmpeg/LibAV in use. For some versions this will be caught in + * *_find_stream_info() above and misreported as an unfound codec + * parameters error. */ +- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) { + if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { - decoder_error (&data->error, ERROR_FATAL, 0, - "The codec is experimental and may damage MOC: %s", - data->codec->name); -@@ -993,8 +993,8 @@ + decoder_error (&data->error, ERROR_FATAL, 0, + "The codec is experimental and may damage MOC: %s", + data->codec->name); +@@ -993,8 +993,8 @@ static void *ffmpeg_open (const char *fi #endif - - set_downmixing (data); -- if (data->codec->capabilities & CODEC_CAP_TRUNCATED) -- data->enc->flags |= CODEC_FLAG_TRUNCATED; + + 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 @@ - - data->sample_width = sfmt_Bps (data->fmt); - -- if (data->codec->capabilities & CODEC_CAP_DELAY) + if (avcodec_open2 (data->enc, data->codec, NULL) < 0) +@@ -1025,7 +1025,7 @@ static void *ffmpeg_open (const char *fi + + 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); - + data->delay = true; + data->seek_broken = is_seek_broken (data); + data->timing_broken = is_timing_broken (data->ic);