gentoo resync : 22.04.2018

1 files changed, 33 insertions, 0 deletions

diff --git a/media-sound/moc/files/ffmpeg4.patch b/media-sound/moc/files/ffmpeg4.patch
new file mode 100644
index 000000000000..28b688823470
--- /dev/null
+++ b/media-sound/moc/files/ffmpeg4.patch
@@ -0,0 +1,33 @@
+Index: moc-2.6-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
+===================================================================
+--- moc-2.6-alpha3.orig/decoder_plugins/ffmpeg/ffmpeg.c
++++ moc-2.6-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -697,7 +697,7 @@ static void *ffmpeg_open_internal (struc
+ 	 * 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);
+@@ -705,8 +705,8 @@ static void *ffmpeg_open_internal (struc
+ 	}
+ 
+ 	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;
+ 
+ 	if (avcodec_open2 (data->enc, data->codec, NULL) < 0)
+ 	{
+@@ -725,7 +725,7 @@ static void *ffmpeg_open_internal (struc
+ 
+ 	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);