gentoo resync : 22.04.2018

48 files changed, 1634 insertions, 152 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 7389bf8e7767..53293b583bbb 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index 403003b733a5..51f38d5e0d04 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,4 +1,5 @@
+AUX ffmpeg4.patch 3163 BLAKE2B 2c7ce91de448b09d34da82d5bef7f23804d37932ad80d2717162e56141f189a2beb12cd6baf2a82712747fd547268e08c2661ce99531ba7553ba351e34a1ba65 SHA512 abaa0d7d63dc3e8ac931ebadd2d9f0057a24ca829c582b5f9e00e2d5fe1d8c9c5f92f3e7d5f8c2422bb1c4a8f6221baaa0679296ac8945ade71bb1a2e9b60262
 DIST CinelerraCV-2.3.tar.xz 25705608 BLAKE2B 70efe03d8c928faca0b60f76b83d7147a7ef68ebee06e7afcb589fd24d73ecbe96e16a375c38f5c89cf337593c824cc22dd6301790ac988946671cb12ba901e6 SHA512 908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e
 DIST cinelerra-2.3-patchset.tar.xz 10056 BLAKE2B c50d65a991a2643267f4c9aff11fb8caf09ba1fae0abe89125207312e8129b28f5ca86846b30a94a90b6958704c1733635b0987752a4d2ec442ea185bf870d89 SHA512 9825729ed15e106b1ec2ca58da4d587597d58a6b62f4440e08e984660821fa0e3cc3dcded5da0a5daae16edf1564a45a32490f50e51d77795ce47e4a5ba39122
-EBUILD cinelerra-2.3.ebuild 3175 BLAKE2B e2ca4361cc086678675ae927822f6b14cf441dc530fd7a0f3d7f95b1594b86aa40ff172be33971b1524f66c665a25ff58a6144f131477a54ec011b92b374e28a SHA512 e3a5d83fc96eee3be189b93718738aadd1aa7ad9f258a0fbb280ae7e8905e621238eb732b4a38bde1f87fc5c219a1fe361333125cc066d80b43abdaf0b1b122a
+EBUILD cinelerra-2.3.ebuild 3267 BLAKE2B 93a45017f07ffb7ad462abebe26331d686e35326c862102c8135011785fda3e3ac61dc239d6c8fd07fc997c04e3a947fbb21b1f6dbdfc0893827456612c1bbe4 SHA512 01dc12224afb8bcbade13958dae3fbbec9ace563f3c8a7a5cbad0274e901a5261f052585815edec8caee1d786207cdc58af823bfde7f2f75dd8f4d5b641647ea
 MISC metadata.xml 259 BLAKE2B d0ebadef8dc30ed8fcc89ae38ab6a5d4af940b2cd75dea1494d96c37557532dea21ef0e014d09e32ae49eca64fe3d6bd56494fb7460ad69b70f40dd4b7ebc8b0 SHA512 c81aea0e68817fa210dc6f66313aee75246139e50d6324338707f11bca2173c64e88ce8440794c85eb64194ff97cf6c6760a06b4822a121e40629bdc3a04e1fd
diff --git a/media-video/cinelerra/cinelerra-2.3.ebuild b/media-video/cinelerra/cinelerra-2.3.ebuild
index 9bb4a4e74fda..f3c12f6b4513 100644
--- a/media-video/cinelerra/cinelerra-2.3.ebuild
+++ b/media-video/cinelerra/cinelerra-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -77,6 +77,10 @@ src_prepare() {
 		epatch "${WORKDIR}"/${P}-patchset/${PN}-ffmpeg29.patch
 	fi
 
+	if has_version '>=media-video/ffmpeg-3.5' ; then
+		epatch "${FILESDIR}/ffmpeg4.patch"
+	fi
+
 	eautoreconf
 }
 
diff --git a/media-video/cinelerra/files/ffmpeg4.patch b/media-video/cinelerra/files/ffmpeg4.patch
new file mode 100644
index 000000000000..982073e138bc
--- /dev/null
+++ b/media-video/cinelerra/files/ffmpeg4.patch
@@ -0,0 +1,83 @@
+Index: CinelerraCV-2.3/quicktime/mpeg4.c
+===================================================================
+--- CinelerraCV-2.3.orig/quicktime/mpeg4.c
++++ CinelerraCV-2.3/quicktime/mpeg4.c
+@@ -625,7 +625,6 @@ static int encode(quicktime_t *file, uns
+ // ffmpeg section
+ 		{
+ 			AVDictionary ** opts = NULL;
+-			static char *video_rc_eq="tex^qComp";
+ 			codec->encode_initialized[current_field] = 1;
+ 			if(!ffmpeg_initialized)
+ 			{
+@@ -650,7 +649,6 @@ static int encode(quicktime_t *file, uns
+ 			context->pix_fmt = AV_PIX_FMT_YUV420P;
+ 			context->bit_rate = codec->bitrate / codec->total_fields;
+ 			context->bit_rate_tolerance = codec->bitrate_tolerance;
+-			context->rc_eq = video_rc_eq;
+         	context->rc_max_rate = 0;
+         	context->rc_min_rate = 0;
+         	context->rc_buffer_size = 0;
+@@ -658,8 +656,6 @@ static int encode(quicktime_t *file, uns
+ 				(!codec->fix_bitrate ? codec->quantizer : 2);
+ 			context->qmax = 
+ 				(!codec->fix_bitrate ? codec->quantizer : 31);
+-			context->lmin = 2 * FF_QP2LAMBDA;
+-			context->lmax = 31 * FF_QP2LAMBDA;
+ 			context->mb_lmin = 2 * FF_QP2LAMBDA;
+ 			context->mb_lmax = 31 * FF_QP2LAMBDA;
+ 			context->max_qdiff = 3;
+@@ -680,8 +676,6 @@ static int encode(quicktime_t *file, uns
+ 			context->frame_skip_cmp = FF_CMP_DCTMAX;
+ 			context->ildct_cmp = FF_CMP_VSAD;
+ 			context->intra_dc_precision = 0;
+-        	context->intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
+-        	context->inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
+         	context->i_quant_factor = -0.8;
+         	context->i_quant_offset = 0.0;
+ 			context->mb_decision = FF_MB_DECISION_SIMPLE;
+@@ -689,18 +683,14 @@ static int encode(quicktime_t *file, uns
+ 			context->me_sub_cmp = FF_CMP_SAD;
+ 			context->me_cmp = FF_CMP_SAD;
+ 			context->me_pre_cmp = FF_CMP_SAD;
+-			context->me_method = ME_EPZS;
+ 			context->me_subpel_quality = 8;
+ 			context->me_penalty_compensation = 256;
+ 			context->me_range = 0;
+-			context->me_threshold = 0;
+-			context->mb_threshold = 0;
+ 			context->nsse_weight= 8;
+         	context->profile= FF_PROFILE_UNKNOWN;
+-			context->rc_buffer_aggressivity = 1.0;
+         	context->level= FF_LEVEL_UNKNOWN;
+ 			av_dict_set(opts, "umv", "1", 0);
+-			context->flags |= CODEC_FLAG_AC_PRED;
++			context->flags |= AV_CODEC_FLAG_AC_PRED;
+ 
+ // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg...
+  			
+@@ -709,7 +699,7 @@ static int encode(quicktime_t *file, uns
+ 			   codec->ffmpeg_id == AV_CODEC_ID_H263 ||
+ 			   codec->ffmpeg_id == AV_CODEC_ID_H263P ||
+ 			   codec->ffmpeg_id == AV_CODEC_ID_FLV1)
+-				context->flags |= CODEC_FLAG_4MV;
++				context->flags |= AV_CODEC_FLAG_4MV;
+ // Not compatible with Win
+ //			context->flags |= CODEC_FLAG_QPEL;
+ 
+@@ -723,12 +713,12 @@ static int encode(quicktime_t *file, uns
+ 			}
+ 
+ 			if(!codec->fix_bitrate)
+-				context->flags |= CODEC_FLAG_QSCALE;
++				context->flags |= AV_CODEC_FLAG_QSCALE;
+ 
+ 			if(codec->interlaced)
+ 			{
+-				context->flags |= CODEC_FLAG_INTERLACED_DCT;
+-				context->flags |= CODEC_FLAG_INTERLACED_ME;
++				context->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
++				context->flags |= AV_CODEC_FLAG_INTERLACED_ME;
+ 			}
+ 
+ 
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 79b916adfe72..b6ae990805f5 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,5 +1,6 @@
+AUX ffmpeg4.patch 541 BLAKE2B ff2ad556e881009ff5ba79b252fd55eb9054ea273f20d4af1bd76440b70d351b03f204ad1ff7648694cab950c49082728b6370a93610dd40c09c10a8609ae5bd SHA512 3ad427f51e5ab24231309f01d410e213df874d01567417ea66bcb88cd39e60d672b4771d8c3f210690eb6d145f3d6f7ff81bca8e1b9c841fb2b895f63070ed11
 DIST DVDStyler-3.0.3.tar.bz2 8850630 BLAKE2B 1fac6687bad0c80728894f1a19ef823d3ba4ea5b648e8e9b6e1b4c98c5d12a353a1bda0499d612ab508ccae16e773c04af6781e189fb09e9799001074d6f7b66 SHA512 b5e5a93d127bc45b844cadce036b2d70ede5b3ea9d5fd026a93d6a6813684873db41ca0d4cd15680e63a63f2ba4314f65c2a0c08e44d0b4bbcce703874c2c3ed
 DIST DVDStyler-3.0.4.tar.bz2 8870498 BLAKE2B c1ec7651d90613cebbd8d4e62b4626b8a7e2069eadc07bfe9a91e51bf33638135ca975f4857242b3f9ff34606a4e6084200059c82ebc3aa146f446f9b77483ae SHA512 2747e6a494d331b6f35405d7d2ed47789f4452bb3d4e86b0c68cf0fafffb4e6de452b28fac0e9995c312017c7e4e8a3f89ad42bf0a0c99ce19c5d6c0ca6e351a
 EBUILD dvdstyler-3.0.3.ebuild 1742 BLAKE2B 3d177cfe322bddbd8fee6fd7a385ddb9eb045c3339769d8cdbd2db28e51c4b17b153a7b7c6674eaa7f1c418b3188fb8b5336771ec19192832a4ebe8dc71fe117 SHA512 ad0abd52ec284e6889cd63b87f663a6330da4b1505d4ef2136c70b9eca973bd2f337b298bbf9261c4e4d8da2ddc44bc478db2404b126dbec2af7b08fa2aac2f7
-EBUILD dvdstyler-3.0.4.ebuild 1742 BLAKE2B 878fdd6969693746aa3c0d36315cb20904c81a132f08bd2959cca856f51b569842d92c875e28a7e748b13afbc83c3383aa68512a7d52772d3afef0a12854b5b4 SHA512 14aaeba45b316e7bbafdc7e54991421b53cd3200e3b01279e7d532fabe118a54ea2bc5fe34f5ffe8409af62ee25b5c1ef3d0c27fcd10a37f9611eeae1d34f3a3
+EBUILD dvdstyler-3.0.4.ebuild 1779 BLAKE2B 1a729b70a24919d8e772a1018e01159284f5a582b6caa5a0557fec083f1b60dd2a378bf0a24b84d583ea20cb65aa5f957c65aa125784fdff3fa86c12089ad891 SHA512 df69841ce940b42779db66aa4e3b33a3b329ff22fc2fabb23783c57749a5cf063c60eb9b9b80bb213b618845aabd698eb2ccec72e7a6a17d5c3a66f77278a7b5
 MISC metadata.xml 302 BLAKE2B 2e58ce53fb249f7e8c837a58561ac4724b7ca19ae8002465e2c98da67674103bfc4d949cebabc8fb11e313d2eda33a476482e253fb8d3d55bc00b79f3c63e633 SHA512 ebc7b7d7e9d24c31f2e6f3cd811dbf7b36e142974cb909bace0929882230be34552aca8741e471374e62ffed749675440d2ee9b723bfd774a1c503d2a5bd40c2
diff --git a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
index 668ddd64d8d3..3df313a5bb0d 100644
--- a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
+++ b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
@@ -46,6 +46,8 @@ DEPEND="${COMMON_DEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	epatch "${FILESDIR}/ffmpeg4.patch"
+
 	need-wxwidgets unicode
 	# disable obsolete GNOME 2.x libraries wrt #508854
 	sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die
diff --git a/media-video/dvdstyler/files/ffmpeg4.patch b/media-video/dvdstyler/files/ffmpeg4.patch
new file mode 100644
index 000000000000..39966dd1dfb8
--- /dev/null
+++ b/media-video/dvdstyler/files/ffmpeg4.patch
@@ -0,0 +1,13 @@
+Index: DVDStyler-3.0.4/src/mediaenc_ffmpeg.cpp
+===================================================================
+--- DVDStyler-3.0.4.orig/src/mediaenc_ffmpeg.cpp
++++ DVDStyler-3.0.4/src/mediaenc_ffmpeg.cpp
+@@ -223,7 +223,7 @@ bool wxFfmpegMediaEncoder::addAudioStrea
+ 	c->time_base = (AVRational){ 1, c->sample_rate };
+ 	// some formats want stream headers to be separate
+ 	if(m_outputCtx->oformat->flags & AVFMT_GLOBALHEADER)
+-	    c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++	    c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 	
+ 	return true;
+ }
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index c58d447b48b4..d2de2aefad91 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,12 +9,14 @@ DIST ffmpeg-3.3.4.tar.bz2 9944256 BLAKE2B 72d42a16396882b30641fb057bb597f8e98ecf
 DIST ffmpeg-3.3.5.tar.bz2 9945243 BLAKE2B 0fb9aad3d35f6173085e5a790e84c3a45c2051b656e9fb12b13af372778861121d6595e1f929144c32c77861d101fdb2a67c4411907147bd5534ce09d0fae3b9 SHA512 b97eb61f1c8f8ee95d79c6c28b37a0a99ad7752605714bfe8827366d319aed8bcaf2403cefb856604e8d61bca54573838c2ea0d38fa89ab453ccdd46b104725a
 DIST ffmpeg-3.3.6.tar.bz2 9943322 BLAKE2B 2526fdf9580045131426e554a9bf44fdc6567c12213ea4d5b78aa27f14513f14e07f38b8380183686fa1a62440fe4108eaecddca96f4dec3c74c410b1f90ee03 SHA512 1305760fa981bcb43c8fcb5dd1bf7dd8d3f405a124975f062062b741d49e12386e4d3eec3de6a032fc93cd7f6086d939275a669a9997ffa400f70c20f7eb3d23
 DIST ffmpeg-3.4.2.tar.bz2 10179184 BLAKE2B a9116fd42b62683d904159b4317df7216df556268d5ac05f48c2204b7269d353746ecd709ad194cab542627047b991528bcfe7c302439753f96ddc5617ab236b SHA512 7d14865316d514b8fee19431b45c5f456422447bd7c68a746e06c6f7450a49aff1ec1d9f88b642c9072e846163d1f7bbe41d1cf73a1ad580f5162f58c8b30fb4
-EBUILD ffmpeg-3.2.6.ebuild 15078 BLAKE2B 5d8e389481ae3ddbd2848fedc7292cdb2131b2c5be63a9d8a5271bee58729dd014e1843ab55c9e5ddb616d4290e8daca0eac8f4c586fbfc5faae989e16929be7 SHA512 56e3a5e60aab2c15d22e9ce9630138ed95ff6e751a41b4211704b052f290d8748a0859766b39e0221d4cb1ad2b1163982a25179861eee7b85707053f99b5f869
-EBUILD ffmpeg-3.2.7.ebuild 15083 BLAKE2B 313da834e164cca1c3fd1fdef6fb0094aefd8b2f752e28895a292221e5005b5d496e480a9dffc779790ee4036121e18fea8ded2eacd5c9e34aa51fc335c11688 SHA512 2645eada5e381a5df2b3972dee7435f51dea461f4535796ededcc4f705979b289c48c289f3384bb58bbe1b6f64dadfda10e2c9d1674bf00d566dfe107f52a42e
-EBUILD ffmpeg-3.3.4.ebuild 16107 BLAKE2B 2dabd381f934dde36e6a1cd25c9c44a93a702bc09f41718649a4bf7139eb18b7854b93350e3b46df1be87fe5f1421683f24a3173431b69901527b7cc63bb97db SHA512 ed129a8ee9f66bed5c2ab724114ed77ad345e7dec13f541ede5371ca442352b2e16666a715c30bac967210464d970bd4728c7753bd08dd542478d43da83b598b
-EBUILD ffmpeg-3.3.5.ebuild 16109 BLAKE2B 53b38d47499dc3ec2d9cf5864ef35999032894dc100d935221ef34294610c980d058288c3ff177b4e4ecd21933426cc57a60611133bf74db9065a09bffcb8f11 SHA512 5a3d8e7d84d0cbe1e23918263be4ef1f379f563c81be266d7e7a8333674f056f69db6e3f88fb8e0521a7f4944fd427c5e91f66b277a19b7029834be9810aa616
-EBUILD ffmpeg-3.3.6.ebuild 16108 BLAKE2B 24663130944a76332e0525a2a420cb08892668a7e86843495ab5cedabe3aeef2c9d801a8c7a5159b75daa33a9d20dc517a3ad5afdb9ef727f2d08b26f4a05f5e SHA512 42982b555e3a3f33a07fdde67deec7db8c05b6c10cb36bcacd2e01e2a98696d6ad240df2fa44e64e50926c52ae7659e105b353897fa9474d2d7357db54e877be
-EBUILD ffmpeg-3.4.2-r1.ebuild 15784 BLAKE2B 122d16027e17e038862c4df10d452ac8909d30ee1030c632b5ea52387f9ca7d375fadd0b5ad4f22b2cd71f97546381fe1c6cf89b7d19c72ca5549d3d3dd1fdba SHA512 57ae6bc5e0d2b56e1f0d4cce36f7317d1c992cc6aaf1c0d792d6889a8ce84314a6ab04a66189f61928984e3e9f76f155d89b5564966c17312c1b0ace6625c903
-EBUILD ffmpeg-3.4.2.ebuild 15729 BLAKE2B b2b84197b20a1b904aa91d4c48b5a7597a25f6911e3d70349cb0595861a6bb2efeb05392a527bd522e5950cd2ef8f8b9d58d75eef60a385401bea22e1bbe53b9 SHA512 a01935dd9c4708bc4b60cc47e57957ab0e65d9ac581aca153fe63362b7d17bc93e5c1f18278d2e7b95952ca4ef5e73d915478a27fb71aa2469885f78679608f7
-EBUILD ffmpeg-9999.ebuild 16256 BLAKE2B 95ab9880fa4286b853267afc96b2ce997abbc005e1e447438278e0f0b7f9fe4f6809a293ac972361c6fe98c38a043bb40e8002bb9aadd7340ed3656930ea397e SHA512 34a70fac57ae25c0ae8b0584a1b8b0b43994fd7494b1be82c8f2093bf1a346646a3cf8ad3b48c18dbf0a9e043e9c829b127a9f65eda4948a9d91b35f1dcd09ac
-MISC metadata.xml 5889 BLAKE2B c12e71db03fdcf4af4dff6a4ab76905c0d2cef2f59b100548402aab77ad86558818562960308d707a1f5c79311203f79a30e7a53ca5eb1fc7cdbd9f26a8c770f SHA512 4fa72cc99ffc2b1df2b6dbf807f0bb9a8abe3c8409d7c442759851dbd83ec22fa97b0cd9d40285df8e7d49686a78d8d7a89ba6cfdde56d2ab26b06c63152fe32
+DIST ffmpeg-4.0.tar.bz2 10423830 BLAKE2B be020731e2ab3567c326b41fdbca7ff9bd35bfff5c4c8c466b73e2dfb1c6ffb59bfbd82c366e40893732fcf0664ab4862db4cff3950a8350aa6c55d25d296417 SHA512 73224e0f29ce39280a7d67fe9f7ad4a2a7cdb079f1b65916cbac5c0754b995d27d85fee3eb9621b6cba4fbd7a07dcf7b94414a8e5bb9b74738d24af18311d0f2
+EBUILD ffmpeg-3.2.6.ebuild 14927 BLAKE2B 8a9e1cda51c5bcd2631b02ec80c8e725ed3974ce795eaafbc62d8b98cbad90c4b33840237f89214a51f78ba2c029a1e983d4722c2f07326239d3b521c981ca76 SHA512 69b076b981f63f9d0e427f0554bc53630dce0fa866a4202426c242ea2e58d75e2edd0198702191c9ae7b9a85e5f7acdfcf666bab954c1c5008e18b19b3474190
+EBUILD ffmpeg-3.2.7.ebuild 14932 BLAKE2B 197c75e1c5cb3ec2b8ed2ae587237ddc8491a83bc89b0f8df99cdc4a29671e0ec2f0c638f269a708fb52ae8dabe33eaf46c0d2fa028a75c4e2e07e7944b62755 SHA512 a32d04b257c547a1f05933ac8499d49fceb1a4aa9aafece17dd438acddb676e7ff7c6f910b052676023eb23116e99d24955d5442796d76175ab51581f2b9571d
+EBUILD ffmpeg-3.3.4.ebuild 15956 BLAKE2B 43f20cd2657f7f18102d67311b5cfac1698e59ca027c2d3547cf24e95aac78f94a35c7ca49e46f207e06351e8fc896527826b097db61e6f4b0d9630612e9a278 SHA512 c1b3d92116726d0a1d3f320b3061670880b23fd40c87512631e2709810eff8d305975cbf2a9964359521888f364dbcbec43a20c702b0c32a053d5280e86b3dc8
+EBUILD ffmpeg-3.3.5.ebuild 15958 BLAKE2B c5d4de18818f991e975e5d4e4af6ba49335c1f508e496131184ee7535872399a2698cf1cb0b94ae90fa1fb541bb2fa38f6e978c256f3b74cdde985eb95ce4ea2 SHA512 c9133381ec0d9046568b11ee9a67455ce5bbc52492b84a2d562f05dc947f4edf45394b5e09bbc3ba68c0945eb4bf7e526dd915bd0885fd5587c61f6448a9b478
+EBUILD ffmpeg-3.3.6.ebuild 15957 BLAKE2B eb439e2f522e49991df4143b4ec69b428e4ea69c97f6aab1d1aa19628d0b311adfb484cd7d807c44b90a8e74c87255992fa8181ad8ddee51ed515424bc7e60b1 SHA512 9329ae807ed9c5e3f63f2ca9c1c658728f924dca5885375438ccc01a22ee9f21da208cfaa62329eb5df77200ba27fc0ffeb3250b6507e6731210b46e973dbd96
+EBUILD ffmpeg-3.4.2-r1.ebuild 15633 BLAKE2B 2e5391e267c92cb7a16b6ee26652f536636a49346d7145c0f2974c6daf546a5b01b745c8038156a76161476b51309f8f622f2ceacb92f0ae1c992284d8161a82 SHA512 5a037bc3c6078776338027492ad55237d3328df390528ad2c3fc3edb52817038e2ca38d297b3302fcd522ec34f69cd8f1b3ee6876997f4a95dd5c938af37c07f
+EBUILD ffmpeg-3.4.2.ebuild 15578 BLAKE2B dd02f1200d7c713f06c606a40386f6432dc4c1b796614e1a4f1faf13e504fd9634e1557d7a70cfb94629228090ca66916510b6328dfde5d0bc0e4cd44a103049 SHA512 b95e7fd722745507d91f23bd365fec8a2193d589bc41821adfb1123fa844bf869eb5e02eb2c3bb936cf4f69b0437fdf875f7bddf821d04105d29b667678abdd8
+EBUILD ffmpeg-4.0.ebuild 16246 BLAKE2B a679ca4d7edb41d99b055e4a7228c15bcc4bbd0f8dc7e3935272c223ae13299c7d1e56c0c7527b8fec3971f63bf1c66c97c505a84483ccede9d07875a5d3f072 SHA512 49990d31b94deb94871ebea86ad9b802cf6ac6dedbd8955af64bb3524147e462904ee8b57d0fb5796ad34f90bfba92770b23d702443c06033832b95ba4754e20
+EBUILD ffmpeg-9999.ebuild 16306 BLAKE2B 907cea2f799f2e20640a063c0bdee755c8b6a5167f52c4d86f4e0b988efab21ea87f17181e5771b0dd58e71fc0167805c4e14ffc12dd4a680fdc3267e17b41ef SHA512 d4779109f7dbc89078c21b46599593efb769a7fbad023c7b7937981116241e372f4ecd3173cadcb1003849dd42be15c426a3e9f85c49117c2d0f68ccf38d49a1
+MISC metadata.xml 6059 BLAKE2B c3bd41f2496c42f3f426f9a06e1ed860f8bf7853b17a1854e5e6211a68ec96bc00aeb239f230c1ff10ae65bf2a2fcb7824dccb8836ab7a3b642ac9208b5bb822 SHA512 43469f265ca75b7ad487bc8b54e47fe632e21af8ec331ff87b0423c534c27b3adcdc92ffd98ea08a24ed3f22584c37b2965977ff600166c1700866841293de85
diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
index 4ff6951374b4..1a9f556fd7b2 100644
--- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
@@ -254,10 +254,6 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
 	postproc? ( gpl )
diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
index 5cf850715a9e..f0b768a683de 100644
--- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
@@ -254,10 +254,6 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
 	postproc? ( gpl )
diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
index 6c79a3343159..7c79a4b4a023 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
@@ -274,10 +274,6 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
 	postproc? ( gpl )
diff --git a/media-video/ffmpeg/ffmpeg-3.3.5.ebuild b/media-video/ffmpeg/ffmpeg-3.3.5.ebuild
index e0a2600142fa..ed98cbe50418 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.5.ebuild
@@ -274,10 +274,6 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
 	postproc? ( gpl )
diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
index ad5b411cc743..d522d44d299e 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
@@ -274,10 +274,6 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
 	postproc? ( gpl )
diff --git a/media-video/ffmpeg/ffmpeg-3.4.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-3.4.2-r1.ebuild
index 4d8f8d283fce..aa8b226963bb 100644
--- a/media-video/ffmpeg/ffmpeg-3.4.2-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.2-r1.ebuild
@@ -263,10 +263,6 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
 	postproc? ( gpl )
diff --git a/media-video/ffmpeg/ffmpeg-3.4.2.ebuild b/media-video/ffmpeg/ffmpeg-3.4.2.ebuild
index d6095bce04b2..bbadaf6cc192 100644
--- a/media-video/ffmpeg/ffmpeg-3.4.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.2.ebuild
@@ -262,10 +262,6 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
 	postproc? ( gpl )
diff --git a/media-video/ffmpeg/ffmpeg-4.0.ebuild b/media-video/ffmpeg/ffmpeg-4.0.ebuild
new file mode 100644
index 000000000000..22e4cd2f2d14
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-4.0.ebuild
@@ -0,0 +1,500 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=56.58.58
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_MIN_CLONE_TYPE="single"
+	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~mips ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+		+gpl +hardcoded-tables +iconv lzma +network opencl openssl +postproc
+		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
+		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse libdrm
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec
+		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
+		# libavfilter options
+		appkit
+		bs2b:libbs2b chromaprint flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype
+		rubberband:librubberband zeromq:libzmq zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	kvazaar:libkvazaar libaom
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa chromium doc +encode jack oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${MIPS_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+	${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libaom? ( media-libs/libaom[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	video_cards_nvidia? ( media-libs/nv-codec-headers[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zeromq? ( >=net-libs/zeromq-4.1.6 )
+	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( sys-apps/texinfo )
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+	test? ( net-misc/wget sys-devel/bc )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+		X? ( !xcb? ( gpl ) )
+	)
+"
+REQUIRED_USE="
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/chromium-r1.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# Incompatible features: openssl and gnutls
+	# openssl support provides a (strict) superset of gnutls support as of 2017.11.30
+	# So, we warn the user and disable gnutls
+	if use openssl && use gnutls; then
+		ewarn "openssl and gnutls are mutually exclusive in ${PN}, disabling gnutls since openssl provides more features"
+		myconf+=( --disable-gnutls )
+	fi
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r libzmq ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+
+	if multilib_is_native_abi && use chromium; then
+		einfo "Configuring for Chromium"
+		mkdir -p ../chromium || die
+		pushd ../chromium >/dev/null || die
+		set -- "${@}" \
+			--disable-shared \
+			--enable-static \
+			--enable-pic \
+			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+		echo "${@}"
+		"${@}" || die
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			einfo "Compiling for Chromium"
+			pushd ../chromium >/dev/null || die
+			emake V=1 libffmpeg
+			popd >/dev/null || die
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			einfo "Installing for Chromium"
+			pushd ../chromium >/dev/null || die
+			emake V=1 DESTDIR="${D}" install-libffmpeg
+			popd >/dev/null || die
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index f25f8ea00468..40d7a117ea58 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -73,15 +73,15 @@ FFMPEG_FLAG_MAP=(
 		# indevs
 		libv4l:libv4l2 pulseaudio:libpulse libdrm
 		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex svg:librsvg vorbis:libvorbis
-		vpx:libvpx zvbi:libzvbi
+		speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec
+		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
 		# libavfilter options
 		appkit
 		bs2b:libbs2b chromaprint flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
+		fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype
 		rubberband:librubberband zeromq:libzmq zimg:libzimg
 		# libswresample options
 		libsoxr
@@ -92,7 +92,7 @@ FFMPEG_FLAG_MAP=(
 # Same as above but for encoders, i.e. they do something only with USE=encode.
 FFMPEG_ENCODER_FLAG_MAP=(
 	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar libaom nvenc:nvenc
+	kvazaar:libkvazaar libaom
 	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
 	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
 )
@@ -170,11 +170,11 @@ RDEPEND="
 	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
 	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
 	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
 	encode? (
 		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
 		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
 		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		nvenc? ( media-video/nvidia_video_sdk )
 		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
 		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
 		theora? (
@@ -217,6 +217,7 @@ RDEPEND="
 	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
 	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
 	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
 	mmal? ( media-libs/raspberrypi-userland )
 	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
@@ -235,6 +236,7 @@ RDEPEND="
 	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
 	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	video_cards_nvidia? ( media-libs/nv-codec-headers[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
 	vorbis? (
 		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
@@ -265,10 +267,6 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
 	postproc? ( gpl )
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 835207d47b64..24bfa8b7c4ab 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -18,6 +18,7 @@
 	<flag name="celt">Adds Xiph CELT audio decoding support via <pkg>media-libs/celt</pkg></flag>
 	<flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg>.</flag>
 	<flag name="chromium">Builds libffmpeg.so to enable media playback in Chromium-based browsers like Opera and Vivaldi.</flag>
+	<flag name="codec2">Enables codec2 low bit rate speech codec support via <pkg>media-libs/codec2</pkg>.</flag>
 	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
 	<flag name="ebur128">Enables EBU R128 loudness normalization filter via <pkg>media-libs/libebur128</pkg></flag>
 	<flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
@@ -36,6 +37,7 @@
 	<flag name="librtmp">Enables Real Time Messaging Protocol using librtmp (<pkg>media-video/rtmpdump</pkg>) in addition to FFmpeg's native implementation.</flag>
 	<flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag>
 	<flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
+	<flag name="lv2">Enables lv2 audio filter wrapper.</flag>
 	<flag name="mipsdspr1">Enables MIPS DSP ASE R1 optimizations.</flag>
 	<flag name="mipsdspr2">Enables MIPS DSP ASE R2 optimizations.</flag>
 	<flag name="mipsfpu">Enables floating point MIPS optimizations.</flag>
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 47da38f71915..e612bc3c5c58 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,10 +1,11 @@
 AUX 110_all_implicitdecls.patch 1048 BLAKE2B a3be6992cd5aff8d99aad583a4c6fae8f0df754d00dc14e46c1c95a192fbf0ab4716132e74957533c30bff7fd896359c151745393c45f94a8a696c127ba53e97 SHA512 cbd949b72bbe708decd7f4d24c2e1f9fbfda658fd6b355f11bc20b19ebf583e74eebb8ffc3c5b9945619efe4022123638fa243abaf07841d41101f62ad51e5ee
+AUX ffmpeg4.patch 1832 BLAKE2B 1770e99dacc641b066d79b83ad145631a1cbe0330e5bcf938b7f6b12bbf648de4185c09ef0fd0cc86e3dd257f1e99f194ab2c5cc5e1125b1c48ed24d413656ab SHA512 81d2f029f0b07e3e32a28a0a9fd6c35ea278d671a6173a58ddb7825b8eb38307d4be58e8dcfb3ca9bb19441964111438fa0b850033ec3f1cc69408b7e9bc9a66
 AUX gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch 542 BLAKE2B 31a9898e8a9741833acacdfa40db23b252a7c4de8491d7c9b80ed700499e11c078205889e402aa415a9e718cfa72783ac40ecc9956dc2e86db45cd5d90964fdc SHA512 65746044b1a8f2125b5113f4ec1ffa2c46b53f1927202c38130431e53875483ac834444e6e5ea1e589176dba0139e9703b4fc61be038ac305234b53765ba16cd
 AUX gpac-0.5.3-static-libs.patch 2843 BLAKE2B 99b301f9e4e0e87d9d93763dc40daa2bc2c57cbac4e09de4e9e86baff98c5ad62e598d532ba843e3eef8e0445c5fe66b03be0e3ef42b54c6dd3a84cff975878f SHA512 aa130e8744124c8cf4d280b669a0e1d133f57e3637a1ab7f151610439d37366145e1aec28a07338118f1c19e5a81c5068dcda813e15787575953332040603d5c
 AUX gpac-0.7.1-configure.patch 2928 BLAKE2B 98ce3227f87c3c4576f5d4bc3a28d560ca3f8d7912414984c7ea58dd27c5717ce30f28b0508368b39fb5b19159e363892fecd0d60d137bd65a4c3d7e02a6d69f SHA512 f359693d43b3d033bc05c8af4951aff9cb432601421d888e50296c6164157b85be368ea4ae828e5229ae9344738bd49136d947ef0eb57bf545f80c3243c94046
 DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
 EBUILD gpac-0.6.1-r2.ebuild 3211 BLAKE2B abcf08b642fec5182c653b186fc61a16b0f8be87bcad28cd7494c3a871cc9717c3d8e9cef51616a7a9b99ed61d9e12644f284ecf95d3fb9fb0f8462faa6667eb SHA512 2bfa94a7e2ccfb8953a505047bcbf2843218530d79b66a839dc2ee9c6d324914d37f673563a0bc71eca4fdd18ee720acdc30fe58d24efb8b347df6030afb75a5
-EBUILD gpac-0.7.1.ebuild 3377 BLAKE2B edd610c616e16037a6767579a497dce33bfaaa16e384e9649e7ff3625fc29b8b30e5a694f0237b3eb3fda0696cd622421bccd21042d10c7e8a7697fc9f74b1bc SHA512 f6f89a82d96599c145ff5f9d95043feae1ab7224d275853502055d4d933e25034a131c8214210cc7e4f7dbe0d7b3de70c8533785bf8fef8a3c3c1e20e23b1c9f
+EBUILD gpac-0.7.1.ebuild 3406 BLAKE2B 37b5d6de46f3ab403b014387cac6b082c07d8cbbb085109cb7e9dcf40d95f94e739cd1feb4739a69db5d1649368e59874e0fabf24e456b20ca320c95694ac686 SHA512 98b41c2655f9e313e5eebafc2babce31072fac002cd83265ca4692ca0b7bd18be274330a2286b897b6edd451b942cc9b120b1689d242a7009a5b4d706f426d45
 EBUILD gpac-9999.ebuild 3095 BLAKE2B 5a1223e8f93f7b0ac751e1a8f46c305b60d578bb8235d23c9bb9f9619db405ee35607714df635d003a0e742b425265114f3e4b2dca527b2601691ee93ce90ba5 SHA512 f5d8046010c916cdca9ae2698e5d08fe29fb2637a869799c021968aad872094d1e2ca68db77cf36c62b154bd5b5e31ff392b01cb522e701c04565304eb185a06
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/files/ffmpeg4.patch b/media-video/gpac/files/ffmpeg4.patch
new file mode 100644
index 000000000000..61f329806a55
--- /dev/null
+++ b/media-video/gpac/files/ffmpeg4.patch
@@ -0,0 +1,44 @@
+Index: gpac-0.7.1/applications/dashcast/video_encoder.c
+===================================================================
+--- gpac-0.7.1.orig/applications/dashcast/video_encoder.c
++++ gpac-0.7.1/applications/dashcast/video_encoder.c
+@@ -144,7 +144,7 @@ int dc_video_encoder_open(VideoOutputFil
+ 	}
+ 
+ 	//the global header gives access to the extradata (SPS/PPS)
+-	video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++	video_output_file->codec_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+ 	video_output_file->vstream_idx = 0;//video_stream->index;
+ 
+Index: gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
+===================================================================
+--- gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c
++++ gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
+@@ -49,7 +49,7 @@
+ static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size) {
+ 	uint8_t * buffer;
+ 	/* Size of buffer must be larger, see avcodec_decode_video2 documentation */
+-	u32 allocatedSz = sizeof( char ) * (FF_INPUT_BUFFER_PADDING_SIZE + size);
++	u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + size);
+ 	if (oldBuffer)
+ 		gf_free(oldBuffer);
+ 	buffer = (uint8_t*)gf_malloc( allocatedSz );
+@@ -577,7 +577,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
+ 		capability->cap.valueInt = 1;
+ 		return GF_OK;
+ 	case GF_CODEC_PADDING_BYTES:
+-		capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
++		capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
+ 		return GF_OK;
+ 	case GF_CODEC_REORDER:
+ 		capability->cap.valueInt = 1;
+@@ -669,7 +669,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
+ 		break;
+ 
+ 	case GF_CODEC_PADDING_BYTES:
+-		capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
++		capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
+ 		break;
+ 	default:
+ 		capability->cap.valueInt = 0;
diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1.ebuild
index 2e7046a175c5..ca4acbd586ef 100644
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ b/media-video/gpac/gpac-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -61,6 +61,7 @@ DEPEND="${RDEPEND}"
 # DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
 PATCHES=(
 	"${FILESDIR}/${PN}-0.7.1-configure.patch"
+	"${FILESDIR}/ffmpeg4.patch"
 )
 
 DOCS=(
diff --git a/media-video/griffith/Manifest b/media-video/griffith/Manifest
index f936099ba869..c0e2fa654106 100644
--- a/media-video/griffith/Manifest
+++ b/media-video/griffith/Manifest
@@ -1,5 +1,5 @@
 AUX 0.10-fix_lib_path.patch 667 BLAKE2B d5c9b02b39de379c494f8828327e7d56a4f73060916b051538b4d7567c1270d667de99b123e423d15236c3c2e428be7a776cc31391b71036bddc742f699ba579 SHA512 9e85aa92627898a667b86ead4ae691c9d2562300f99da4c4efe57644a9c2bddef0648fce39290b50471cc22e49b4bd478979d3147dfda8a52e8bd55d2c1c6ee7
 DIST griffith-0.13.tar.gz 1565903 BLAKE2B d3d806ef2a7cef76ce548e3ad785e96938447cb6425ac95fdbb4b5ae233adb2aeb4a274aa24c9e502607bc1287ea30ce8806cb1608fc194531757943e499b0e7 SHA512 dc8117b1a89253a87eb303c5229e6cdffde26b52de9ac4a3409dcc3f6dca64105f13a98cace225a932aefb2d620e828eea66bae57f40328b7ee3c06a944f0bed
 DIST griffith-extra-artwork-0.9.4.tar.gz 124008 BLAKE2B 992f8e4995d0465e891eacfe601eead2323754c60ad0c0a96ea9568dbecf5790039f58212e8a115f382532e1787e4db267b1259ac91de40728f7911f6b2178ae SHA512 09e912b4511c5c4a7b501d9a8f98223d20e58574e667cdb759e66f743cce14b45cce8bf0f9502ff2aacfc09e7a7b37966a887205a74a6e028b832703a65a2734
-EBUILD griffith-0.13-r1.ebuild 2104 BLAKE2B 346dbbcaa46a1e99c8f657a0bb3526107d3dddce68f6215b3cc190f69455947beb1cd0953400eda436911e0307e4efe177dc676becb4b592388622cfd5d6f50d SHA512 d295f32b9daf641cb05dd8cd9be7d3852725d4dfa66220f24eb478599d6d9b210b93d1d87d2be9f99c1a11e8ecc3f2b95f54e1fd984288cf41232cf4d2a59e75
+EBUILD griffith-0.13-r2.ebuild 2068 BLAKE2B ca7b4d15c67c6c132491d7abafd8545caa1b5cd2951d85b9b489c4732601ac7964e573c8dabf545e768a89cd8e2249eb57f75001d8d2308bb4d46f0006dba159 SHA512 e777dc37a63b01cfb7818fad1487795a1d768606d5389215335787da7ccabd69310b415c0e2fc82456d1c4c9ead0472b8bfa72310b8f3b668ffcfc6b5f772957
 MISC metadata.xml 462 BLAKE2B df960fbecf048f49e770eeb90631d4f987c3185a44fe1e83f0681fdc9a59e249d08f3ed36cae93e865d97cc9f513284ae4d890f037b143ce9f802f9d64f69d0f SHA512 0aab82c7eaffc0269cb66bbdb5df6e98dad1259c50bfc5343839a7ec2c6b547d3f5d47053673dd8759d945083f2860790a7e2f2efb5f8b0f50be4e74beb1381e
diff --git a/media-video/griffith/griffith-0.13-r1.ebuild b/media-video/griffith/griffith-0.13-r2.ebuild
index 55114ed59695..66b03bc29c8b 100644
--- a/media-video/griffith/griffith-0.13-r1.ebuild
+++ b/media-video/griffith/griffith-0.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,6 @@ RDEPEND="
 	${PYTHON_DEPS}
 	dev-python/pillow[${PYTHON_USEDEP}]
 	gnome-base/libglade[${PYTHON_USEDEP}]
-	dev-python/pyxml[${PYTHON_USEDEP}]
 	>=dev-python/pygtk-2.6.1:2[${PYTHON_USEDEP}]
 	dev-python/pygobject:2[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-0.5.2[${PYTHON_USEDEP}]
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 53ce93cbd550..f4c6a6fb0e0d 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,8 +1,9 @@
 AUX ffmpeg3.patch 1159 BLAKE2B 537c6ef20c0c1ea7396eaca7488487a335e18c33d8982135272bd4344961c1047ad08571e3721d532d5460e48a61ba7d1b65b716597dff6c51d8f9a0b9fc6b21 SHA512 0707e6ff0fa2098b02c58001014d9ddf09b3b9dc9f211d74143c893b0a3cb1bc12cfbb05a05cacf7599689441934a63294d7fbed1a4b4e273aea0058dc41a6ee
+AUX ffmpeg4.patch 7046 BLAKE2B 570d5a582bd76a11be2fa444cdce9c178590235eb7f1b765827dddd318ca0923206f45849ea29671e3d642b72a46eb9b58d9c2aa9735c0f312dd81f6002a488d SHA512 bc9225d94160a565bdfd524853d37d54594acae7df80c7ffd694e79943273568bd497e9e0ac24c154823bc272cfdc1f697823feb95d191aea829f331ed0daf98
 DIST guvcview-src-2.0.3.tar.gz 1062788 BLAKE2B 18cb79838e5c797fd07219345f7d7ae0a997f4360b95ceabac3c4adddf7cdef57ba23d0514e9038f05a67aef2ce6ab8e656f8a8774c843a7e1db66eaf9a1553a SHA512 976e62ffe26bd9c815ff754337a42512c6fcc9d55285e79e0505f6211a7ca2407546e433fc0e8439ea541ef51a23101b0badda2f9fcc9d197d3a2ab27983b704
 DIST guvcview-src-2.0.4.tar.gz 1120666 BLAKE2B 582d2b36effda9dd99b5ee54f42f91bdc0001cc885c3a21f67d3fdb49cac95deaf41bb1700021fc9ae438fc64926abfe9cb1366c32ff8b04e84a30ce771edc09 SHA512 9339e9cf7dc5224f1b87bb21e0ad711d9c27f4197d5f758c70edf465eb01c8c9c51542c75d686f0439f9e843a1c14c2f76835e8529b87b35a737fc5ccb01fe0a
 DIST guvcview-src-2.0.5.tar.gz 1134237 BLAKE2B 6165349005a07e3e9ea555a7b4aa731ec218f8073dfce8ac5036dd3ccbe4228aeb3b29491c8ad545d5b5ab193045704a60bfcd48459bfc56ad923b583c08f5be SHA512 b4a1216ab2effbd0022d5ba0ce266ac06a781e453d3dbedfe29b654864d3a26fe1e8b68245d76eff854281d42f1871a8a82b06f783b5115e94ec1c111aac05eb
 EBUILD guvcview-2.0.3.ebuild 1266 BLAKE2B fe89ee1d75f1340b688cbbc344e74b140f337fde49715bbabada8be880d5ef425a2c981ae75fde67092bb43c83079443a86fa0dedfe1129c7602995327f7c494 SHA512 8b2302dd8513622e99895d627006583569c17ffa033df755caa0b0128c83980e33d3163913a76bf83625d17f2a3e0617d3b40a0779aeb87398b0e14648ec9dae
 EBUILD guvcview-2.0.4.ebuild 1320 BLAKE2B 17fcab349c12b7f8aecab83f62dfe79868ecfe58bca8ec847fb5650be3edcd3391a79d59137933b925a6d3883500c0a8f2a83690fca71e7bb481a39181fbbc67 SHA512 593c8fecd6475822e55a7ec9b4b5176e032f16861c97c1f74a6dc8c3a2234991232740ea76d5d3ab1bac52831f4a1d39d979d464f300485e6e7412632427e095
-EBUILD guvcview-2.0.5.ebuild 1326 BLAKE2B 18e862c8fae52cd65e8085f3dc87f0e3b3711bff96badb907751f5e6a433e29b9096e1cb0f25806b9295a469b94dcbda9ff9d3cab4a19d23ddc2872de48e10f9 SHA512 9b84a52c39b4005d8becedabddc19587491638873600c5d6c7bc1909810734884f7ed2dbb326d4f3f460f90e94e1906819e8485ebb75d513ecb436f862788d68
+EBUILD guvcview-2.0.5.ebuild 1402 BLAKE2B 8601540bb8d20e7090138ffc2111d541858c9bfad0faad5d4df3e20ab86aff0e47df73d6dc4157c117051d15148511634f840b5312ba951ddfa8610e744e782b SHA512 a27b9958971f22e5f7c27fefd8c79e7446885a63e270fdad40ca199f1ac399964cc2c12f9ef20c420582dbfb8b237a4b9cda09c90c2a8a6dea43d58d7bc68616
 MISC metadata.xml 301 BLAKE2B 4364fa7d4b27716ae8088bb8f7268bfceb9a607ea39a8ab794359ee2690d134ae493ae11a344dc2f26a25a7c51cecc1a6aad892102a7d7e2ac692fa18d020ae0 SHA512 c4c12767b33b64b58f02905235bebe4337c18d5a7e33dbb02c50c29effa9d236bc137b41ff8b0948aaeab36deb6f282c57d1770d7594cc087caeac7dc1036b8c
diff --git a/media-video/guvcview/files/ffmpeg4.patch b/media-video/guvcview/files/ffmpeg4.patch
new file mode 100644
index 000000000000..e6421834b5b0
--- /dev/null
+++ b/media-video/guvcview/files/ffmpeg4.patch
@@ -0,0 +1,195 @@
+Index: guvcview-src-2.0.5/guvcview/gui_qt5_callbacks.cpp
+===================================================================
+--- guvcview-src-2.0.5.orig/guvcview/gui_qt5_callbacks.cpp
++++ guvcview-src-2.0.5/guvcview/gui_qt5_callbacks.cpp
+@@ -1590,10 +1590,8 @@ void MainWindow::video_codec_properties(
+ 	framerefs->setValue(defaults->framerefs);
+ 	form.addRow(_("framerefs:   "), framerefs);
+ 	/*me method*/
+-	QSpinBox *me_method = new QSpinBox(&dialog);
+-	me_method->setRange(1, 10);
+-	me_method->setSingleStep(1);						
+-	me_method->setValue(defaults->me_method);
++	QLabel *me_method = new QLabel(&dialog);
++	me_method->setText(defaults->me_method);
+ 	form.addRow(_("me method:   "), me_method);
+ 	/*mb decision*/
+ 	QSpinBox *mb_decision = new QSpinBox(&dialog);
+@@ -1645,7 +1643,7 @@ void MainWindow::video_codec_properties(
+ 		defaults->qblur = qblur->value();
+ 		defaults->subq = subq->value();
+ 		defaults->framerefs = framerefs->value();
+-		defaults->me_method = me_method->value();
++		defaults->me_method = me_method->text().toLatin1().data();
+ 		defaults->mb_decision = mb_decision->value();
+ 		defaults->max_b_frames = max_b_frames->value();
+ 		defaults->num_threads = num_threads->value();
+Index: guvcview-src-2.0.5/gview_encoder/encoder.c
+===================================================================
+--- guvcview-src-2.0.5.orig/gview_encoder/encoder.c
++++ guvcview-src-2.0.5/gview_encoder/encoder.c
+@@ -445,10 +445,8 @@ static encoder_video_context_t *encoder_
+ #if !LIBAVCODEC_VER_AT_LEAST(56,60)
+ 	video_codec_data->codec_context->me_method = video_defaults->me_method;
+ #else
+-	if( video_defaults->codec_id == AV_CODEC_ID_H264 && video_defaults->me_method > 4)
+-		video_defaults->me_method = X264_ME_HEX;
+-
+-	av_dict_set_int(&video_codec_data->private_options, "motion-est", video_defaults->me_method, 0);
++	if(video_defaults->me_method)
++		av_dict_set(&video_codec_data->private_options, "motion-est", video_defaults->me_method, 0);
+ #endif
+ 
+ #if !LIBAVCODEC_VER_AT_LEAST(57,00)
+Index: guvcview-src-2.0.5/gview_encoder/gviewencoder.h
+===================================================================
+--- guvcview-src-2.0.5.orig/gview_encoder/gviewencoder.h
++++ guvcview-src-2.0.5/gview_encoder/gviewencoder.h
+@@ -104,7 +104,7 @@ typedef struct _video_codec_t
+ 	char codec_name[20];      //lavc codec_name
+ 	int mb_decision;          //lavc mb_decision
+ 	int trellis;              //lavc trellis quantization
+-	int me_method;            //lavc motion estimation method
++	const char* me_method;            //lavc motion estimation method
+ 	int mpeg_quant;           //lavc mpeg quantization
+ 	int max_b_frames;         //lavc max b frames
+ 	int num_threads;          //lavc num threads
+Index: guvcview-src-2.0.5/gview_encoder/video_codecs.c
+===================================================================
+--- guvcview-src-2.0.5.orig/gview_encoder/video_codecs.c
++++ guvcview-src-2.0.5/gview_encoder/video_codecs.c
+@@ -97,7 +97,7 @@ static video_codec_t listSupCodecs[] =
+ 		.codec_name   = "none",
+ 		.mb_decision  = 0,
+ 		.trellis      = 0,
+-		.me_method    = 0,
++		.me_method    = NULL,
+ 		.mpeg_quant   = 0,
+ 		.max_b_frames = 0,
+ 		.num_threads  = 0,
+@@ -133,7 +133,7 @@ static video_codec_t listSupCodecs[] =
+ 		.codec_name   = "mjpeg",
+ 		.mb_decision  = 0,
+ 		.trellis      = 0,
+-		.me_method    = ME_EPZS,
++		.me_method    = "epsz",
+ 		.mpeg_quant   = 0,
+ 		.max_b_frames = 0,
+ 		.num_threads  = 0,
+@@ -169,7 +169,7 @@ static video_codec_t listSupCodecs[] =
+ 		.codec_name   = "mpeg1video",
+ 		.mb_decision  = FF_MB_DECISION_RD,
+ 		.trellis      = 1,
+-		.me_method    = ME_EPZS,
++		.me_method    = "epsz",
+ 		.mpeg_quant   = 0,
+ 		.max_b_frames = 0,
+ 		.num_threads  = 1,
+@@ -205,11 +205,11 @@ static video_codec_t listSupCodecs[] =
+ 		.codec_name   = "flv",
+ 		.mb_decision  = FF_MB_DECISION_RD,
+ 		.trellis      = 1,
+-		.me_method    = ME_EPZS,
++		.me_method    = "epsz",
+ 		.mpeg_quant   = 0,
+ 		.max_b_frames = 0,
+ 		.num_threads  = 1,
+-		.flags        = CODEC_FLAG_4MV
++		.flags        = AV_CODEC_FLAG_4MV
+ 	},
+ 	{
+ 		.valid        = 1,
+@@ -241,7 +241,7 @@ static video_codec_t listSupCodecs[] =
+ 		.codec_name   = "wmv1",
+ 		.mb_decision  = FF_MB_DECISION_RD,
+ 		.trellis      = 1,
+-		.me_method    = ME_EPZS,
++		.me_method    = "epsz",
+ 		.mpeg_quant   = 0,
+ 		.max_b_frames = 0,
+ 		.num_threads  = 1,
+@@ -277,7 +277,7 @@ static video_codec_t listSupCodecs[] =
+ 		.codec_name   = "mpeg2video",
+ 		.mb_decision  = FF_MB_DECISION_RD,
+ 		.trellis      = 1,
+-		.me_method    = ME_EPZS,
++		.me_method    = "epsz",
+ 		.mpeg_quant   = 0,
+ 		.max_b_frames = 0,
+ 		.num_threads  = 1,
+@@ -313,7 +313,7 @@ static video_codec_t listSupCodecs[] =
+ 		.codec_name   = "msmpeg4v3",
+ 		.mb_decision  = FF_MB_DECISION_RD,
+ 		.trellis      = 1,
+-		.me_method    = ME_EPZS,
++		.me_method    = "epsz",
+ 		.mpeg_quant   = 0,
+ 		.max_b_frames = 0,
+ 		.num_threads  = 1,
+@@ -349,7 +349,7 @@ static video_codec_t listSupCodecs[] =
+ 		.codec_name   = "mpeg4",
+ 		.mb_decision  = FF_MB_DECISION_RD,
+ 		.trellis      = 1,
+-		.me_method    = ME_EPZS,
++		.me_method    = "epsz",
+ 		.mpeg_quant   = 1,
+ 		.max_b_frames = 0,
+ 		.num_threads  = 1,
+@@ -385,7 +385,7 @@ static video_codec_t listSupCodecs[] =
+ 		.codec_name   = "libx264",
+ 		.mb_decision  = FF_MB_DECISION_RD,
+ 		.trellis      = 0,
+-		.me_method    = X264_ME_HEX,
++		.me_method    = "hex",
+ 		.mpeg_quant   = 1,
+ 		.max_b_frames = 16,
+ 		.num_threads  = 4,
+@@ -426,7 +426,7 @@ static video_codec_t listSupCodecs[] =
+ 		.codec_name   = "libx265",
+ 		.mb_decision  = FF_MB_DECISION_RD,
+ 		.trellis      = 0,
+-		.me_method    = ME_HEX,
++		.me_method    = "hex",
+ 		.mpeg_quant   = 1,
+ 		.max_b_frames = 16,
+ 		.num_threads  = 4,
+@@ -463,7 +463,7 @@ static video_codec_t listSupCodecs[] =
+ 		.codec_name   = "libvpx_vp8",
+ 		.mb_decision  = FF_MB_DECISION_RD,
+ 		.trellis      = 0,
+-		.me_method    = ME_HEX,
++		.me_method    = "hex",
+ 		.mpeg_quant   = 1,
+ 		.max_b_frames = 0,
+ 		.num_threads  = 4,
+@@ -500,7 +500,7 @@ static video_codec_t listSupCodecs[] =
+ 		.codec_name   = "libvpx_vp9",
+ 		.mb_decision  = FF_MB_DECISION_RD,
+ 		.trellis      = 0,
+-		.me_method    = ME_HEX,
++		.me_method    = "hex",
+ 		.mpeg_quant   = 1,
+ 		.max_b_frames = 16,
+ 		.num_threads  = 4,
+@@ -537,7 +537,7 @@ static video_codec_t listSupCodecs[] =
+ 		.codec_name   = "libtheora",
+ 		.mb_decision  = FF_MB_DECISION_RD,
+ 		.trellis      = 0,
+-		.me_method    = ME_HEX,
++		.me_method    = "hex",
+ 		.mpeg_quant   = 1,
+ 		.max_b_frames = 0,
+ 		.num_threads  = 4,
+Index: guvcview-src-2.0.5/gview_v4l2core/uvc_h264.c
+===================================================================
+--- guvcview-src-2.0.5.orig/gview_v4l2core/uvc_h264.c
++++ guvcview-src-2.0.5/gview_v4l2core/uvc_h264.c
+@@ -1039,7 +1039,7 @@ int h264_init_decoder(int width, int hei
+ 		exit(-1);
+ 	}
+ 	
+-	h264_ctx->context->flags2 |= CODEC_FLAG2_FAST;
++	h264_ctx->context->flags2 |= AV_CODEC_FLAG2_FAST;
+ 	h264_ctx->context->pix_fmt = AV_PIX_FMT_YUV420P;
+ 	h264_ctx->context->width = width;
+ 	h264_ctx->context->height = height;
diff --git a/media-video/guvcview/guvcview-2.0.5.ebuild b/media-video/guvcview/guvcview-2.0.5.ebuild
index d2b5e54c3eab..80229e7311d7 100644
--- a/media-video/guvcview/guvcview-2.0.5.ebuild
+++ b/media-video/guvcview/guvcview-2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -41,6 +41,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	sed -i '/^docdir/,/^$/d' Makefile.am || die
+	has_version '>=media-video/ffmpeg-4' && epatch "${FILESDIR}/ffmpeg4.patch"
 	eautoreconf
 }
 
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index a36c9c15cf31..e152b4dba0ef 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,4 +1,5 @@
 AUX handbrake-0.10.3-nolibav.patch 2821 BLAKE2B 78294506e6b3efe71d7d14537c2e605d10067fd9e637f06ff3b01a9d8e6bea34dfb2c871bb2558e35310bebdb4922ae99f63d9f7911f7236a28ea1a4dc3d6832 SHA512 88a0b5df6cc198a8383a2d1dcf6d4c71f24445ea71e29dac570a2b3987cdaa0a563b56c7cccd291b58099dbdb15130bdcc0cd4527bdaeb442aefe4fa06455ec7
+AUX handbrake-1.1.0-nolibav.patch 9306 BLAKE2B 8b3fafe2063fc03d1e4a571eb5133b532e760dda4cafaee80b748efcacfc8c3546531e29393a82582cde75f14d07fccc9f4b3451d497cf3beae97d0e93da5515 SHA512 42f21168349a9120c78f80f14c3faea81ed4d65b9987aaa8162b718dbb919a7e736969c1ae18083bb853b657e45bd20453e6fa3a304e11592bc48c1faaa4f285
 AUX handbrake-9999-fix-missing-x265-link-flag.patch 281 BLAKE2B 623f902bb31586513a51db95a63841e6234d4841d6332d2be9a6a0d7fd07f3e9cc694eb8945bebf718e10538fa390bbaa9dcbea81ba5324cbf20bd64bc582fdb SHA512 30d457258dd287cae3df66e7899b66480be2212a3969fe3a4e4f99ed383740e8f597fa7cf869922f29f501f100313b7efd78ebe09e2949ed4c235e2df22d22e5
 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
 AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
@@ -7,6 +8,6 @@ DIST handbrake-1.0.7.tar.bz2 12650549 BLAKE2B 54fa6f4ee053de3ce1840695e66b0fef5a
 DIST handbrake-1.1.0.tar.bz2 15262590 BLAKE2B b2f892c57cd562124460ac2846949bd0ce05eff0b87fbd733d7102eeda9455f57997fb0bbd72d991d0f2d8ab3f02e6f82d88a0449158c3a947595f50198eb4bd SHA512 48cbbc57e93e74a8aa3d224311f5d97905061e103c3ecb07aa5e09d8f401687679cac0e8952e146fea0fad5d00e6c26fe90159c11e87b8b413469abbe900edc3
 EBUILD handbrake-0.10.5-r2.ebuild 3479 BLAKE2B d035befa6a812aab6a6f4f333bf66637009d228cf54ddc22dc3ec8d95ec9b8b5cea6183c8366352dd2c82452303126d4dfe9a449848d2cccb844486cbda36f70 SHA512 1f5bf9e88bbed89473edcf81013eee4b6ef223ea4fe9fc43ca46aa0b1ce657a122f2f6a020b46d354d36fb4c6044911c36c3c37793f5d2c6feffe89275d3ce52
 EBUILD handbrake-1.0.7.ebuild 3524 BLAKE2B 26efd30bd6f2e359fb5059aa2713645b7b7a3a1ae929b5492fb4589d2b76f454653994d88d8bbb875212080cc75933bf1cb8a90b1443022de0e7e2a7c0476786 SHA512 b519a8842dbd5a1420e1b3bd4256b2edbf5b1163c0a2eac90a6386798d86af63cdf18aa519f4244b51042a38a14a10cfae6fbf3211dbd9e1c981f730011dfb99
-EBUILD handbrake-1.1.0.ebuild 3530 BLAKE2B e7661612fab7f3f3873f815bf62d73e22152b05732d151f384f263515f499ae512386d666fba56b9caf75c88542e16b57cdafd2f70b55b4215d4aaa7257e4da3 SHA512 a9cf9b909ca2d52b745ebf00a858625c8da53df868197a5ba0327bbe851dbb9d22d6e75c0366474e8020407d6b2542137ddb94d87ad927034759cb92aa130db0
+EBUILD handbrake-1.1.0.ebuild 3597 BLAKE2B bcaa5f077f58ed23a8cd32a869c9eab0e0411a743794363322065e7fd8e048e3a7a46824ef8ab7e077b2b4fc4778c46ea73f3a7796625e593e54629fcbc756f8 SHA512 bfd15f0a8691d9b33089353dd8f500b8ad2155ef3d423d96247f20e1da2fdf8c908c37b75eb7ebfca1f9a0ab52255840902489d86b802cf3e7f073544e93771b
 EBUILD handbrake-9999.ebuild 3524 BLAKE2B 26efd30bd6f2e359fb5059aa2713645b7b7a3a1ae929b5492fb4589d2b76f454653994d88d8bbb875212080cc75933bf1cb8a90b1443022de0e7e2a7c0476786 SHA512 b519a8842dbd5a1420e1b3bd4256b2edbf5b1163c0a2eac90a6386798d86af63cdf18aa519f4244b51042a38a14a10cfae6fbf3211dbd9e1c981f730011dfb99
 MISC metadata.xml 826 BLAKE2B 3cbdae05b5011afa3ef7dd76f7979756e0385584511b9eecdac3cc9a031ed31cc64b225214acf6e8f4691455ac31c4a8f9fa8612884705c3da23ab4bbae32e7b SHA512 f6344c1c82a507438d41d38020cd3ca33ba056d156d0fcdc72b6c4def5adee1260bb1f89ad8aec544f22e58738c2be22da210bfad7b2ed6c95f201cdc619a0d6
diff --git a/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch b/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch
new file mode 100644
index 000000000000..bb7e17bdde5b
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch
@@ -0,0 +1,235 @@
+From 9e1f245708a157231c427c0ef9b91729d59a30e1 Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins.hb@gmail.com>
+Date: Tue, 28 Nov 2017 08:22:54 -0800
+Subject: [PATCH] add sdtp (sample dependency) box to mp4 (#1006)
+
+* add sdtp (sample dependency) box to mp4
+
+The AppleTV 4K requires this box in order to play 2160p60 video.
+---
+ contrib/ffmpeg/A21-mp4-sdtp.patch | 126 ++++++++++++++++++++++++++++++++++++++
+ libhb/encavcodec.c                |   8 ++-
+ libhb/encx264.c                   |   7 +--
+ libhb/encx265.c                   |   3 +
+ libhb/muxavformat.c               |   4 ++
+ 5 files changed, 140 insertions(+), 8 deletions(-)
+ create mode 100644 contrib/ffmpeg/A21-mp4-sdtp.patch
+
+diff --git a/contrib/ffmpeg/A21-mp4-sdtp.patch b/contrib/ffmpeg/A21-mp4-sdtp.patch
+new file mode 100644
+index 000000000..5d2221c47
+--- /dev/null
++++ b/contrib/ffmpeg/A21-mp4-sdtp.patch
+@@ -0,0 +1,126 @@
++From c2204c579c8411771b53a4bc66324c7c5d07698a Mon Sep 17 00:00:00 2001
++From: John Stebbins <stebbins@jetheaddev.com>
++Date: Thu, 16 Nov 2017 14:40:12 -0800
++Subject: [PATCH] movenc: add sdtp (sample dependency) box to mp4
++
++The AppleTV 4K requires this box in order to play 2160p60 video.
++---
++ libavcodec/avcodec.h |  9 +++++++--
++ libavformat/movenc.c | 34 +++++++++++++++++++++++++++++++++-
++ libavformat/movenc.h |  6 ++++++
++ 3 files changed, 46 insertions(+), 3 deletions(-)
++
++diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
++index 5624835023..48e9d23679 100644
++--- a/libavcodec/avcodec.h
+++++ b/libavcodec/avcodec.h
++@@ -1161,8 +1161,13 @@ typedef struct AVPacket {
++     int64_t convergence_duration;
++ #endif
++ } AVPacket;
++-#define AV_PKT_FLAG_KEY     0x0001 ///< The packet contains a keyframe
++-#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
+++#define AV_PKT_FLAG_KEY         0x0001 ///< The packet contains a keyframe
+++#define AV_PKT_FLAG_CORRUPT     0x0002 ///< The packet content is corrupted
+++/**
+++ * Flag is used to indicate packets that contain frames that can
+++ * be discarded by the decoder.  I.e. Non-reference frames.
+++ */
+++#define AV_PKT_FLAG_DISPOSABLE  0x0004
++ 
++ enum AVSideDataParamChangeFlags {
++     AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT  = 0x0001,
++diff --git a/libavformat/movenc.c b/libavformat/movenc.c
++index a546fdfead..d263f444f4 100644
++--- a/libavformat/movenc.c
+++++ b/libavformat/movenc.c
++@@ -227,6 +227,30 @@ static int mov_write_stss_tag(AVIOContext *pb, MOVTrack *track, uint32_t flag)
++     return update_size(pb, pos);
++ }
++ 
+++/* Sample dependency atom */
+++static int mov_write_sdtp_tag(AVIOContext *pb, MOVTrack *track)
+++{
+++    int i;
+++    uint8_t leading, dependent, reference, redundancy;
+++    int64_t pos = avio_tell(pb);
+++    avio_wb32(pb, 0); // size
+++    ffio_wfourcc(pb, "sdtp");
+++    avio_wb32(pb, 0); // version & flags
+++    for (i = 0; i < track->entry; i++) {
+++        dependent = MOV_SAMPLE_DEPENDENCY_YES;
+++        leading = reference = redundancy = MOV_SAMPLE_DEPENDENCY_UNKNOWN;
+++        if (track->cluster[i].flags & MOV_DISPOSABLE_SAMPLE) {
+++            reference = MOV_SAMPLE_DEPENDENCY_NO;
+++        }
+++        if (track->cluster[i].flags & MOV_SYNC_SAMPLE) {
+++            dependent = MOV_SAMPLE_DEPENDENCY_NO;
+++        }
+++        avio_w8(pb, (leading << 6)   | (dependent << 4) |
+++                    (reference << 2) | redundancy);
+++    }
+++    return update_size(pb, pos);
+++}
+++
++ static int mov_write_amr_tag(AVIOContext *pb, MOVTrack *track)
++ {
++     avio_wb32(pb, 0x11); /* size */
++@@ -1211,8 +1235,12 @@ static int mov_write_stbl_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra
++     mov_write_stts_tag(pb, track);
++     if ((track->par->codec_type == AVMEDIA_TYPE_VIDEO ||
++          track->par->codec_tag == MKTAG('r','t','p',' ')) &&
++-        track->has_keyframes && track->has_keyframes < track->entry)
+++        track->has_keyframes && track->has_keyframes < track->entry) {
++         mov_write_stss_tag(pb, track, MOV_SYNC_SAMPLE);
+++    }
+++    if (track->par->codec_type == AVMEDIA_TYPE_VIDEO && track->has_disposable) {
+++        mov_write_sdtp_tag(pb, track);
+++    }
++     if (track->mode == MODE_MOV && track->flags & MOV_TRACK_STPS)
++         mov_write_stss_tag(pb, track, MOV_PARTIAL_SYNC_SAMPLE);
++     if (track->par->codec_type == AVMEDIA_TYPE_VIDEO &&
++@@ -3647,6 +3675,10 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
++         if (trk->cluster[trk->entry].flags & MOV_SYNC_SAMPLE)
++             trk->has_keyframes++;
++     }
+++    if (pkt->flags & AV_PKT_FLAG_DISPOSABLE) {
+++        trk->cluster[trk->entry].flags |= MOV_DISPOSABLE_SAMPLE;
+++        trk->has_disposable++;
+++    }
++     trk->entry++;
++     trk->sample_count += samples_in_chunk;
++     mov->mdat_size    += size;
++diff --git a/libavformat/movenc.h b/libavformat/movenc.h
++index 008f4671c6..f4eb4e8078 100644
++--- a/libavformat/movenc.h
+++++ b/libavformat/movenc.h
++@@ -51,6 +51,7 @@ typedef struct MOVIentry {
++     int          cts;
++ #define MOV_SYNC_SAMPLE         0x0001
++ #define MOV_PARTIAL_SYNC_SAMPLE 0x0002
+++#define MOV_DISPOSABLE_SAMPLE   0x0004
++     uint32_t     flags;
++ } MOVIentry;
++ 
++@@ -85,6 +86,7 @@ typedef struct MOVTrack {
++     long        sample_count;
++     long        sample_size;
++     int         has_keyframes;
+++    int         has_disposable;
++ #define MOV_TRACK_CTTS         0x0001
++ #define MOV_TRACK_STPS         0x0002
++ #define MOV_TRACK_ENABLED      0x0004
++@@ -180,6 +182,10 @@ typedef struct MOVMuxContext {
++     int missing_duration_warned;
++ } MOVMuxContext;
++ 
+++#define MOV_SAMPLE_DEPENDENCY_UNKNOWN 0x0
+++#define MOV_SAMPLE_DEPENDENCY_YES     0x1
+++#define MOV_SAMPLE_DEPENDENCY_NO      0x2
+++
++ #define FF_MOV_FLAG_RTP_HINT              (1 <<  0)
++ #define FF_MOV_FLAG_FRAGMENT              (1 <<  1)
++ #define FF_MOV_FLAG_EMPTY_MOOV            (1 <<  2)
++-- 
++2.13.6
++
+diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
+index 59d491148..9960a21b4 100644
+--- a/libhb/encavcodec.c
++++ b/libhb/encavcodec.c
+@@ -532,12 +532,14 @@ static void get_packets( hb_work_object_t * w, hb_buffer_list_t * list )
+         out->s.duration = get_frame_duration(pv, frameno);
+         out->s.stop     = out->s.stop + out->s.duration;
+         // libav 12 deprecated context->coded_frame, so we can't determine
+-        // the exact frame type any more.  Luckily for us, we really don't
+-        // require it.
++        // the exact frame type any more. So until I can completely
++        // wire up ffmpeg with AV_PKT_DISPOSABLE_FRAME, all frames
++        // must be considered to potentially be reference frames
++        out->s.flags     = HB_FLAG_FRAMETYPE_REF;
+         out->s.frametype = 0;
+         if (pkt.flags & AV_PKT_FLAG_KEY)
+         {
+-            out->s.flags = HB_FLAG_FRAMETYPE_REF | HB_FLAG_FRAMETYPE_KEY;
++            out->s.flags |= HB_FLAG_FRAMETYPE_KEY;
+             hb_chapter_dequeue(pv->chapter_queue, out);
+         }
+         out = process_delay_list(pv, out);
+diff --git a/libhb/encx264.c b/libhb/encx264.c
+index ce7879ec7..26645213a 100644
+--- a/libhb/encx264.c
++++ b/libhb/encx264.c
+@@ -701,6 +701,7 @@ static hb_buffer_t *nal_encode( hb_work_object_t *w, x264_picture_t *pic_out,
+              frames we only get the duration of the first which will
+              eventually screw up the muxer & decoder. */
+     int i;
++    buf->s.flags &= ~HB_FLAG_FRAMETYPE_REF;
+     for( i = 0; i < i_nal; i++ )
+     {
+         int size = nal[i].i_payload;
+@@ -737,11 +738,7 @@ static hb_buffer_t *nal_encode( hb_work_object_t *w, x264_picture_t *pic_out,
+          * Also, since libx264 doesn't tell us when B-frames are
+          * themselves reference frames, figure it out on our own.
+          */
+-        if (nal[i].i_ref_idc == NAL_PRIORITY_DISPOSABLE)
+-        {
+-            buf->s.flags &= ~HB_FLAG_FRAMETYPE_REF;
+-        }
+-        else
++        if (nal[i].i_ref_idc != NAL_PRIORITY_DISPOSABLE)
+         {
+             if (buf->s.frametype == HB_FRAME_B)
+             {
+diff --git a/libhb/encx265.c b/libhb/encx265.c
+index ec7b7d574..242dc6f1f 100644
+--- a/libhb/encx265.c
++++ b/libhb/encx265.c
+@@ -425,16 +425,19 @@ static hb_buffer_t* nal_encode(hb_work_object_t *w,
+             buf->s.frametype = HB_FRAME_IDR;
+             break;
+         case X265_TYPE_P:
++            buf->s.flags |= HB_FLAG_FRAMETYPE_REF;
+             buf->s.frametype = HB_FRAME_P;
+             break;
+         case X265_TYPE_B:
+             buf->s.frametype = HB_FRAME_B;
+             break;
+         case X265_TYPE_BREF:
++            buf->s.flags |= HB_FLAG_FRAMETYPE_REF;
+             buf->s.frametype = HB_FRAME_BREF;
+             break;
+         case X265_TYPE_I:
+         default:
++            buf->s.flags |= HB_FLAG_FRAMETYPE_REF;
+             buf->s.frametype = HB_FRAME_I;
+             break;
+     }
+diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
+index f85336dfe..62a270d5b 100644
+--- a/libhb/muxavformat.c
++++ b/libhb/muxavformat.c
+@@ -1197,6 +1197,10 @@ static int avformatMux(hb_mux_object_t *m, hb_mux_data_t *track, hb_buffer_t *bu
+         {
+             pkt.flags |= AV_PKT_FLAG_KEY;
+         }
++        if (!(buf->s.flags & HB_FLAG_FRAMETYPE_REF))
++        {
++            pkt.flags |= AV_PKT_FLAG_DISPOSABLE;
++        }
+     }
+     else if (buf->s.frametype & HB_FRAME_MASK_KEY)
+     {
diff --git a/media-video/handbrake/handbrake-1.1.0.ebuild b/media-video/handbrake/handbrake-1.1.0.ebuild
index 4ea9a4d91e3e..e5423a884920 100644
--- a/media-video/handbrake/handbrake-1.1.0.ebuild
+++ b/media-video/handbrake/handbrake-1.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools eutils gnome2-utils python-any-r1
+inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
@@ -99,7 +99,7 @@ src_prepare() {
 	default
 
 	# Get rid of libav specific code when using ffmpeg
-	use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
+	use libav || eapply -R "${FILESDIR}/${PN}-1.1.0-nolibav.patch"
 
 	cd "${S}/gtk"
 	# Don't run autogen.sh.
@@ -145,6 +145,7 @@ pkg_postinst() {
 	fi
 
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_preinst() {
@@ -153,4 +154,5 @@ pkg_preinst() {
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/media-video/kamoso/Manifest b/media-video/kamoso/Manifest
deleted file mode 100644
index eafbf2fc5de4..000000000000
--- a/media-video/kamoso/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kamoso-3.2.4.tar.xz 178976 BLAKE2B 2e2bb53fa18f9a1a92653ead8175a01a10409021bd04b2f45cb4bc603d931f93176e6215c1d85a8ac667602fbce1c1c3a9123a078c08293496d9c5cf137e298c SHA512 5665887e00e61c37a6079ad4fda800a507a57c3da6ee76daffb63e59d23c69e8b76063fc1383f5ef5f8c7fc3b91fee2f6e8ebe41945ca26a6a12e07249bacf2b
-EBUILD kamoso-3.2.4.ebuild 827 BLAKE2B b523fcfeb19c20d205c30d1bc52ce0488201bab08ee99542c95f5504697944be7cd7aaf629bb70e4318be326c4d36f8d0a90f7e5738b2b7a44d3bf6892785f9a SHA512 2fa5b06830e718aecf6ae179c31f44c360bdf4c14493cbbaa2a59719a7fa7e3f1500551929fcd193802921070179fef12c675d7252ad9bf2620c19de4acbf069
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-video/kamoso/kamoso-3.2.4.ebuild b/media-video/kamoso/kamoso-3.2.4.ebuild
deleted file mode 100644
index 061fb9aa08c7..000000000000
--- a/media-video/kamoso/kamoso-3.2.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5 versionator
-
-DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
-HOMEPAGE="https://userbase.kde.org/Kamoso"
-SRC_URI="mirror://kde/stable/${PN}/$(get_version_component_range 1-2)/src/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	kde-frameworks/purpose:5
-	media-libs/qt-gstreamer[qt5(+)]
-	virtual/libudev:=
-"
-RDEPEND="${DEPEND}
-	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
-"
diff --git a/media-video/kamoso/metadata.xml b/media-video/kamoso/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/media-video/kamoso/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 4bb14dbf0656..16b4df910ac2 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -8,10 +8,10 @@ DIST libav-11.8.tar.xz 4865796 BLAKE2B fb0e8f129edee0423252f334b12485d514f9fdfb3
 DIST libav-12.2.tar.xz 5268804 BLAKE2B e25b3dfe1026b9e69c89cbec2090070088a7004dc03e8cc23da2da03824a627c733c16c67e5fc65ec9f19942d93405d5ba6926de83cae04c497597f55220f004 SHA512 4b37cfb18a6cf6f12eddb5175b1751c093f3a495ae1d1b588884c60157cb260479b1d8fa3a6e3e08c00d7a26422b1e78a750eb35cf7bc763c01790f3567cba03
 DIST libav-13_pre20171219.tar.xz 5427904 BLAKE2B 074dc5d071aeb656fc14a015c2e3c168aa81d25e2fb08d99e300dc47d7ea28f61500fcfab0b16fa136261a5af27631b7536eb3aefa0e1feb4d615af57f9f5a36 SHA512 0c9b59957f1fbbff8f5b95b02c11014a4efdddf4b7e1b158cd0fda3af8b89bd90d48263ed0239915adfb7abcd7a8b22c278cd5cf1d01822bd22df65cc7f69689
 DIST libav-9.17.tar.xz 4080028 BLAKE2B 206e80835292af9f4c1c65539e69981b6993679c11e8a1feef1e37dc32174e47744ebce319b8709bcd60804f493fab1e524c781e174d60d9ebe35ad01f6fbc60 SHA512 20af83d4b6a23c159c2386b6592ba6a6acf3f2c54e8aeb16dd0c8a64d637fbde24f37b864698b1143c6802b64a7b5e8ddfe0e7601b35c35686a789e2b3232f5a
-EBUILD libav-11.8.ebuild 11241 BLAKE2B 53b4d84474b17c28d362db15ae62296bd95015c307ef8f294c991a0aa9e4eea6d2990c542665accefaa39d2bab12a0d337b97c3ed6bcf24cc8b80bd32e60610d SHA512 82091fc9f20bcb357a759248c145e2723c10293f9b6114f1d0af1b0bac219e7edb891665c792eaacc6c517167803a83bff3fe4e57bbf95ab37206f048d40c2f3
-EBUILD libav-11.9999.ebuild 11141 BLAKE2B d7205d9a0d0e359b12c1e43ce315d0998dbe825fa39bc6cd02f23b142d1281a8327ca5578ced5767af43e89885509ee51e7eb2921b20f019b754b55ca7c63ada SHA512 c879c5bc09b22f77387bf62066b845d8d2e6f6e130d1a439dcc648cf7f1802df0abddcfb9a6c7f3fe11d122abe33da3726cd89eab1346fcce39730cc47f18cfe
-EBUILD libav-12.2.ebuild 11522 BLAKE2B 1aaf92397a4829251a03abae83ec3b06208c490f6f80ee37aad48930771c958afe88b50656b99a4f4a0a7d889137c413a347f0a46b681e5a4aad1dbf75c8be97 SHA512 a6afb2e793af497cff59660936b2aee2ff990faade1d8af9b52aa62c2380b3229f340a7698ff892aa87c603490e6965bdf1b422124cd560d76f77b961058f062
-EBUILD libav-13_pre20171219.ebuild 10941 BLAKE2B 80bca84307c4e999f621ddb8f495a53979221c769eec27f36ef930d5f72c4154871ee0579c8925fd0726dc24914463667625482d3d66532eccaeda0b845c28bc SHA512 ad192093c6d8897ec42af7f12009d84c4c2a0af35a1ae5fdc8569d9b86293fd3781f6858bb6e100d46790df18c81297aee0e20e90c459a01b2032a8d6dd36373
-EBUILD libav-9.17.ebuild 10192 BLAKE2B 5cba6be794e6f712aec7086805244ff6bc0e3d007844e63393f36a955508808aed89bd74e3b8a09280501785a5fa174a07b7590e6cd667b848afba5bef004e6f SHA512 c12da6532ceeb8da0eff9336727d189cd67c6a296c2597cd20e3216082a111c5baefaf329eaed3376b7c8cd6434dc56af806819df83599a61d3998114b8dbb4e
-EBUILD libav-9999.ebuild 11000 BLAKE2B c17516a7dcf3a3683b2eff1f77f72292ed3103306a94744e547ccf65a9753024480087954fafc71e1b61d3f37695344ea84fddef802a4e455feee435a963362c SHA512 575a6074f8341186c57191d95ab7f40be180fdc4f3a58b981d5ef7d7e8427556841bacd08fd28504f4f96a3e07abbf8fb2afe10b9e3058e382064ef086f6b03a
+EBUILD libav-11.8.ebuild 11090 BLAKE2B bce6ee5af8fb86a4ca1c760fff386b4e3c7c70f4b8353e2d24162c7da9a42ee742b6a230b3e6b84ef57fb1bd957bb83e2d7c340e669ea2de4f98e46c2af8f319 SHA512 6b50605fe7e2d0f9468fa46e8d7b513db03603622ff69559e4517c1f610ea4be8fb8bceada46ab50694cc9bbbf6c0a5d1d2aa35a20046ffda7a60d4991d74037
+EBUILD libav-11.9999.ebuild 10990 BLAKE2B 2bab5e0b48d1d490d35c991fd74f4629a0de5b5375d7f9955c0d49c4f7a35fd6f1cfcc91b09833d89dc8f4fe01a29b0ab9058887c2ab2a299a957c0a6acfd50d SHA512 d5a1a7ecd91dbf0bad318ec8c5705afff4b12fd956da8e2a06ac7de002dd23e3dd8a86b5e162097901617d52ca0bdafd5ccc09b08fec51dc9b249d2169b58d90
+EBUILD libav-12.2.ebuild 11371 BLAKE2B a558cbff15f22cd682d718a54f92bd2649fbb599ef4c381ad955c4bb96d9481f478e4248c9551b64b069193ce1d5a54b2690be837972d8b183c836a2e1bdb124 SHA512 b49a1637c76d20c52ec9dc7abec7924251f1bf6f4be618cf469d6fd7d317e07046841f3e25a74bb3860aceb0d928335feabd9a42bb2b9d296648e1d70efba861
+EBUILD libav-13_pre20171219.ebuild 10790 BLAKE2B 5a33e384d54549ec4fad1c082022b9d7187c3e3032461c38a1e237683e6e27b400a7bf23bc220fde169b1b2d7fd59b50620dbc4c4d9d2c8b2df195fbd3d4be05 SHA512 764fbebd1a086913e2a85430732a7b56a369a02a0200f10ed6fd7fef552bf76638df65601f7e2afdbc68987dccd777c403ed2799cca096bf606e382ee2681f54
+EBUILD libav-9.17.ebuild 10041 BLAKE2B 617748930bb9951d89565e004e9d3495356e72ddb8d725393b4737a5b8f5a0a88f0eb31edb0e225a78b15c21cff902361c6129dd5c2f9c8ab637951a5228fd3d SHA512 36df276551e286588e10352731ace7123963551cdfe5e33cb6f6bcfd9de54df206fdb078e48d61b407b81ccd19cd1ac9dda01c5f9049f51de34de6ea84f913ab
+EBUILD libav-9999.ebuild 10849 BLAKE2B 1cccc4d2a8e55b9bc0f14d838689a253d52db1e741fe22f8b00bf2d90ab1460b0598e7c1fe9773ed7650af8d20942601698ae86e465272054ec8f5bb28b22936 SHA512 0c41cc11dd22ab4a7afe412e78e07d693a57dfbc97667a4bbe12eb294406f524d287a226ac7911ed3b6a329bf9a5b1b20d08f96d9cdb614fa947c9ef19f10035
 MISC metadata.xml 2959 BLAKE2B abfe1c0bf88198c05a25a629ae4a65829057428362cc35feb02cc9ea9abf718e6478dd605a0b79fbf40e0a41de109765b08c8adff34b3e06dfc1e77d478de2e4 SHA512 ac43516b324f96eb13b2ae4ab511c1dfffddd47293079b9b297ee3f312e92a0dc88561d55bb8d12e6bd89a8ace62670ad30b723a48708046f987cc65244bc628
diff --git a/media-video/libav/libav-11.8.ebuild b/media-video/libav/libav-11.8.ebuild
index 04dccfd24e3f..86c3ec705693 100644
--- a/media-video/libav/libav-11.8.ebuild
+++ b/media-video/libav/libav-11.8.ebuild
@@ -122,10 +122,6 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # faac can't be binary distributed
 # openssl support marked as nonfree
 # faac and aac are concurent implementations
diff --git a/media-video/libav/libav-11.9999.ebuild b/media-video/libav/libav-11.9999.ebuild
index f97572a73515..7e5f92570421 100644
--- a/media-video/libav/libav-11.9999.ebuild
+++ b/media-video/libav/libav-11.9999.ebuild
@@ -122,10 +122,6 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # faac can't be binary distributed
 # openssl support marked as nonfree
 # faac and aac are concurent implementations
diff --git a/media-video/libav/libav-12.2.ebuild b/media-video/libav/libav-12.2.ebuild
index 4d3632d69969..41a6b2cf7eac 100644
--- a/media-video/libav/libav-12.2.ebuild
+++ b/media-video/libav/libav-12.2.ebuild
@@ -123,10 +123,6 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # faac can't be binary distributed
 # openssl support marked as nonfree
 # faac and aac are concurent implementations
diff --git a/media-video/libav/libav-13_pre20171219.ebuild b/media-video/libav/libav-13_pre20171219.ebuild
index 3958953fa54f..6bd86f8e6d1b 100644
--- a/media-video/libav/libav-13_pre20171219.ebuild
+++ b/media-video/libav/libav-13_pre20171219.ebuild
@@ -119,10 +119,6 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # faac can't be binary distributed
 # openssl support marked as nonfree
 # faac and aac are concurent implementations
diff --git a/media-video/libav/libav-9.17.ebuild b/media-video/libav/libav-9.17.ebuild
index ed4682dcaaf7..96df97611251 100644
--- a/media-video/libav/libav-9.17.ebuild
+++ b/media-video/libav/libav-9.17.ebuild
@@ -114,10 +114,6 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # faac can't be binary distributed
 # openssl support marked as nonfree
 # faac and aac are concurent implementations
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index d56d1db06ef8..ca54c7a80c29 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -119,10 +119,6 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # faac can't be binary distributed
 # openssl support marked as nonfree
 # faac and aac are concurent implementations
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index ef2d0741d49f..0452101ab8c3 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -2,6 +2,6 @@ AUX mjpegtools-2.1.0-no_format.patch 2800 BLAKE2B fd608ca5b9700fc0ab216f99be79fe
 AUX mjpegtools-2.1.0-pic.patch 2282 BLAKE2B 9b35e26e4ef300747b6426cab8800c2bf92daddd43649dd673cb175bf7121b9d5b81097e296c7e111652b1bba4e77939db30cea2a317b26ab893a7e7444f0709 SHA512 3ad9d0b488a4fcc29fab8c0cc8322d99e63c755234c02a7fe7ad7efa974f67871460f43db05ca8097c358fdf7aafcc852967959a2abc83460c258aa38a448e28
 AUX mjpegtools-2.1.0-sdl-cflags.patch 387 BLAKE2B ad8065afdf164335e77adf972b21c6fd7108dba3f21a56006eede02a650f7f0728950c36f9e73dbedd9713eb69f8dab010c547c472c02abd8642dc518cc43621 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602
 DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
-EBUILD mjpegtools-2.1.0-r2.ebuild 3009 BLAKE2B def74cd50de2a79c220e6d7fe39a3f76855dc27ca0563cc59064162de6984524cc54ffeae00ce7a2b1538354cabb68c9ace57dc158f15f0d7c67cbd5a9921b09 SHA512 48572d402737cf8c045abccc31b0641224f7a776380246687187463b6daa4a0a62279b7a2c0d4f39ddd0fb2cb81ad864c2bfc0fb9d8c8c02aef166b5ce593e83
-EBUILD mjpegtools-2.1.0-r3.ebuild 3047 BLAKE2B 322bfe024f663322c042376c12e82078ddab031f404e8ab23b981062df8f42eb7b9c8256695918f0ddbfa1ef10cc4e2c3551087461c9f050f9178094b3c5eb06 SHA512 345ab87e154dedb8f01d224da45283744810f78eec20726ffdd28e7fecb6eb7dd8fa3a3a98c8de416ad2cd5af9e3b7bfd1604beb5cb2063f2d8c4dcaa3e70050
+EBUILD mjpegtools-2.1.0-r2.ebuild 2855 BLAKE2B 81909edf169cd3d15493e25e8863e5971f449f6dfb0d2767ddc0f46f010842133de46122a5181b2f584b3731d6f722953b9ef4b8c9bede6a227b8172c824e622 SHA512 84e5827b985eee8ab7fbf9c9999e98a11075552e1b60e4e558344e0c98a77b0ba719b2e2e1187cffee5f98e7afc45fed16bc917aaaa407ceda83ab57a736eef7
+EBUILD mjpegtools-2.1.0-r3.ebuild 2893 BLAKE2B 5df89a94b2ca7231cfbcfc576b12579cd6a6439268b59e7eb3b63e5edaedcd4bd53e890abec452beae10581bb95774d887678b161d3e29811e3420fc2274742e SHA512 d85bb1730190bfd0ed4d62c6949b89034d8a68de39c5285941975fcf805116540af9eac4a0cca61fe82a58f255f99689f5c8b3cb80f9a463da9fd4c5b1745a55
 MISC metadata.xml 537 BLAKE2B 9a038894ff7da6df6f8746be16e0a0f9e0586321eba052a95afd038d2625110d7dbcd2961ac8de8c14ab2fd74ccb2eb3881d64c8b96c97936e92173e2b62a67b SHA512 f3360892e77c064d2062bb963b91f031587ebed6a31b8ba2c698d969cf88998daec9ef910689f477e36921df60d2aa8bdfbe569dda701b0e375d75acfd31d79d
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
index 4c26bb3b89e5..99e778a7bbac 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
@@ -31,12 +31,6 @@ DEPEND="${RDEPEND}
 	virtual/awk
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-medialibs-20140508-r4
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-	)"
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-pic.patch
 	# https://sourceforge.net/p/mjpeg/bugs/139/
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index 2a79372d49cc..7d41dcbe2185 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -31,12 +31,6 @@ DEPEND="${RDEPEND}
 	virtual/awk
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
 
-RDEPEND="${RDEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-medialibs-20140508-r4
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-	)"
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-pic.patch
 	# https://sourceforge.net/p/mjpeg/bugs/139/
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 827a454ebda0..d0f03e2e2a5f 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,5 +1,6 @@
 AUX dump_ffmpeg.sh 2529 BLAKE2B 2c945fcf0b430d74c85557f82497dbc4a2a8308ecb34c86e42cc3c6a5eed20496691839355c068ccabf6d20d11d62035231aa208341a1ce9affc44b3e30acfde SHA512 12c15efa5cdb99eac92ff808fa56c6137343cca48b73d5875a7a6b08cf36ebeda5022eb3bae0ba567ff9031d2a0f3b5dbe69ee191ae8ecf48b98a779504df66c
 AUX mplayer-1.3-CVE-2016-4352.patch 617 BLAKE2B 57f85be46230fa0576c6569bafc8c65f24b0a59d3b083c06d2e14fe176505567feca5024bafd73fb1b48960ea95a4705132ed6e2166a31aabcd1e34fc41e3803 SHA512 654bfa8368a02669ba249aa0c1a605f285d4d967b7038285df0ba7b83cd034ac3aff933a564fd6f33c7a153267be19d9eb517a52c8f4b53a6f81b6b2c5558512
+AUX mplayer-1.3-ffmpeg4.patch 25679 BLAKE2B 08f9ddb05a11c9b7ce0de7fe7bb92b492d1b35e65437c09be07cd39aa70cd9541baf442ffae1ee3060fd94d78eca30fa35808db8eebfdf679456da2c1d8217e8 SHA512 9f29fcd0bfd374fecf15a40c51e2bac53d2646d939ea13e7afffc8e9854d6d2105142f95745f0b26d8f58e19938c5ccedb191af30858fb6f3520072c98db3081
 AUX mplayer-1.3-vdpau-x11.patch 547 BLAKE2B b168b61f5712788c25164cf286a119de1d42c1a142048fc8b138226d146614d7fc454dd7a5c05bfcbdef815bf5d5e18064e2893a3adecd0733fcb79a803a5876 SHA512 439c7925f97b973597239a8f684171e752321dad4bae80a3a2bad46dcf6bf0c49b0839cd5cdac5c8e0b9f5c165061b4177d05cd8060ebba6cd5c4e730ab019ab
 AUX prepare_mplayer.sh 757 BLAKE2B 5de1cb4b17628dd5443f98a20717f8ed028a76446104a471a669b1c7ed7a5b76a8e86203f436240312ac4814a0ba7dba7856bb4f3723da850188a3003aae8bbb SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a
 DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a38b2bc6a2ce0ce062f213bf46c11c67b0d93dd53ea3bd618c74df08bf756e8872d172c1b27e0e175fc67c236a077 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
@@ -7,6 +8,6 @@ DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e
 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
 EBUILD mplayer-1.3.0-r3.ebuild 17268 BLAKE2B 39bc007a2cd9c4d24423e34f4b5748225bb3eb673866e363e52f4cea715ce0a7c5ffd4768bd662e153b66290c07a2fe3bee0215aba30c70a5f4eab5339602d6a SHA512 1ef846cce25623acb7f58ea8f359b9ec3acf545c7c38f463d7df129bfe768d01f863bd852037244807fa8c1370660686f7c45a34756c42f8c60dd4548c0b79d1
-EBUILD mplayer-1.3.0-r5.ebuild 17204 BLAKE2B 6cc8f0cf6bc3306edff795d14f2033bbaa46163e50399f4f9469b1804513b2b4a3628c6db6233c0cf63f1409b99550b6455c1d55a7391df09341ce8d5b72bc32 SHA512 43ef4c57b375697da0bca7a008d50a4b640f4c98e8379404c020459a3b64492ea675b7f15edf248b6f88ff4e067dd2f578c677e58fe210d36fd0cdba66195b1f
+EBUILD mplayer-1.3.0-r5.ebuild 17292 BLAKE2B e0bd384bdf678e8228dc8c166e3144356eec062aea1e49c8783b0e91bb9d10bad6d8c0ed9dfdeada3e55a60fed94f25d84cbc78e0f23602adafbf5dde8b696c1 SHA512 c1c4b50020f43d729b8cab478c21d9ffe00924022759f58cc3115fa83dbde31c198a79cde94d2d325a4186d9561dc5c0782be54e740998a4223e5b0a375cf1ee
 EBUILD mplayer-9999.ebuild 17046 BLAKE2B e487b19e4e0ad97ee04d5c852e73ea9150b13987fd55582ba7d2b7cfa77d6293f4b44a91a42b6514b7600ff858892f57d64433ec1eeef163ac68243a28684f1c SHA512 7fbf34300dd4167f22269ee8538ed912e3516fa395462e656e21f9020bf86dc8f9d9d856d59359c7ad45db5506418ee85db113a7b77bfeafd821a8f3c210eec5
 MISC metadata.xml 2530 BLAKE2B 83baf1357e9b0d31244b7c04ceab7eec0bc7db7eb9a2de4ffc1a85cc49af40f1094d9bdbac22c9abff43c215c19e5b8c745afbd397ae7221921c24b422590e3a SHA512 b650af6aa25ee064d81d3db5cc066d634eaf8c8ccdf8e1352d449f0579b0a310026be2ff873999767c5b82c25a76c138af722220892794b9c615ce477335a93b
diff --git a/media-video/mplayer/files/mplayer-1.3-ffmpeg4.patch b/media-video/mplayer/files/mplayer-1.3-ffmpeg4.patch
new file mode 100644
index 000000000000..036f9d151771
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.3-ffmpeg4.patch
@@ -0,0 +1,501 @@
+Index: Makefile
+===================================================================
+--- a/Makefile.orig
++++ b/Makefile
+@@ -68,7 +68,6 @@ SRCS_COMMON-$(CONFIG_VF_LAVFI)      +=
+ 
+ # These filters use private headers and do not work with shared FFmpeg.
+ SRCS_COMMON-$(FFMPEG_A)              += libmpcodecs/vf_fspp.c           \
+-                                        libmpcodecs/vf_mcdeint.c        \
+                                         libmpcodecs/vf_qp.c             \
+                                         libmpcodecs/vf_spp.c            \
+                                         libmpcodecs/vf_uspp.c           \
+@@ -616,9 +615,7 @@ SRCS_MPLAYER = command.c
+ 
+ #MEncoder
+ SRCS_MENCODER-$(FAAC)             += libmpcodecs/ae_faac.c
+-SRCS_MENCODER-$(FFMPEG)           += libmpcodecs/ae_lavc.c              \
+-                                     libmpcodecs/ve_lavc.c              \
+-                                     libmpdemux/muxer_lavf.c
++SRCS_MENCODER-$(FFMPEG)           += libmpdemux/muxer_lavf.c
+ SRCS_MENCODER-$(LIBDV)            += libmpcodecs/ve_libdv.c
+ SRCS_MENCODER-$(LIBLZO)           += libmpcodecs/ve_nuv.c               \
+                                      libmpcodecs/native/rtjpegn.c
+Index: cfg-mencoder.h
+===================================================================
+--- a/cfg-mencoder.h.orig
++++ b/cfg-mencoder.h
+@@ -52,7 +52,7 @@ const m_option_t ovc_conf[]={
+     "   nuv      - nuppel video\n"
+ #endif
+ #ifdef CONFIG_FFMPEG
+-    "   lavc     - libavcodec codecs - best quality!\n"
++//    "   lavc     - libavcodec codecs - best quality!\n"//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps
+ #endif
+ #ifdef CONFIG_WIN32DLL
+     "   vfw      - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n"
+@@ -106,7 +106,7 @@ const m_option_t oac_conf[]={
+     "   mp3lame  - cbr/abr/vbr MP3 using libmp3lame\n"
+ #endif
+ #ifdef CONFIG_FFMPEG
+-    "   lavc     - FFmpeg audio encoder (MP2, AC3, ...)\n"
++//    "   lavc     - FFmpeg audio encoder (MP2, AC3, ...)\n"//TODO: ae_lavc was deactivated because it depends on ve_lavc which does not compile after latest FFmpeg major bumps
+ #endif
+ #ifdef CONFIG_TOOLAME
+     "   toolame  - Toolame MP2 audio encoder\n"
+@@ -226,7 +226,7 @@ const m_option_t mencoder_opts[]={
+     {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
+ #endif
+ #ifdef CONFIG_FFMPEG
+-    {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
++    //{"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, //TODO: ve_lavc doesn't build after latest FFmpeg major bumps
+ #else
+     {"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+ #endif /* CONFIG_FFMPEG */
+Index: gui/util/bitmap.c
+===================================================================
+--- a/gui/util/bitmap.c.orig
++++ b/gui/util/bitmap.c
+@@ -95,7 +95,7 @@ static int pngRead(const char *fname, gu
+         return 3;
+     }
+ 
+-    data = av_malloc(len + FF_INPUT_BUFFER_PADDING_SIZE);
++    data = av_malloc(len + AV_INPUT_BUFFER_PADDING_SIZE);
+ 
+     if (!data) {
+         fclose(file);
+Index: libmpdemux/demuxer.c
+===================================================================
+--- a/libmpdemux/demuxer.c.orig
++++ b/libmpdemux/demuxer.c
+@@ -50,7 +50,7 @@
+ 
+ #ifdef CONFIG_FFMPEG
+ #include "libavcodec/avcodec.h"
+-#if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE
++#if MP_INPUT_BUFFER_PADDING_SIZE < AV_INPUT_BUFFER_PADDING_SIZE
+ #error MP_INPUT_BUFFER_PADDING_SIZE is too small!
+ #endif
+ #include "av_helpers.h"
+Index: libmpdemux/demux_lavf.c
+===================================================================
+--- a/libmpdemux/demux_lavf.c.orig
++++ b/libmpdemux/demux_lavf.c
+@@ -176,7 +176,7 @@ static int lavf_check_file(demuxer_t *de
+     }
+ 
+     avpd.buf = av_mallocz(FFMAX(BIO_BUFFER_SIZE, PROBE_BUF_SIZE) +
+-                          FF_INPUT_BUFFER_PADDING_SIZE);
++                          AV_INPUT_BUFFER_PADDING_SIZE);
+     do {
+         read_size = stream_read(demuxer->stream, avpd.buf + probe_data_size, read_size);
+         if(read_size < 0) {
+Index: libmpcodecs/vf_uspp.c
+===================================================================
+--- a/libmpcodecs/vf_uspp.c.orig
++++ b/libmpcodecs/vf_uspp.c
+@@ -240,7 +240,7 @@ static int config(struct vf_instance *vf
+             avctx_enc->gop_size = 300;
+             avctx_enc->max_b_frames= 0;
+             avctx_enc->pix_fmt = AV_PIX_FMT_YUV420P;
+-            avctx_enc->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY;
++            avctx_enc->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY;
+             avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             avctx_enc->global_quality= 123;
+             av_dict_set(&opts, "no_bitstream", "1", 0);
+Index: libmpcodecs/ad_ffmpeg.c
+===================================================================
+--- a/libmpcodecs/ad_ffmpeg.c.orig
++++ b/libmpcodecs/ad_ffmpeg.c
+@@ -134,7 +134,7 @@ static int init(sh_audio_t *sh_audio)
+ 
+     /* alloc extra data */
+     if (sh_audio->wf && sh_audio->wf->cbSize > 0) {
+-        lavc_context->extradata = av_mallocz(sh_audio->wf->cbSize + FF_INPUT_BUFFER_PADDING_SIZE);
++        lavc_context->extradata = av_mallocz(sh_audio->wf->cbSize + AV_INPUT_BUFFER_PADDING_SIZE);
+         lavc_context->extradata_size = sh_audio->wf->cbSize;
+         memcpy(lavc_context->extradata, sh_audio->wf + 1,
+                lavc_context->extradata_size);
+Index: libmpcodecs/vf_lavc.c
+===================================================================
+--- a/libmpcodecs/vf_lavc.c.orig
++++ b/libmpcodecs/vf_lavc.c
+@@ -157,7 +157,7 @@ static int vf_open(vf_instance_t *vf, ch
+ 
+     if(p_quality<32){
+ 	// fixed qscale
+-	lavc_venc_context.flags = CODEC_FLAG_QSCALE;
++	lavc_venc_context.flags = AV_CODEC_FLAG_QSCALE;
+ 	lavc_venc_context.global_quality =
+ 	vf->priv->pic->quality = (int)(FF_QP2LAMBDA * ((p_quality<1) ? 1 : p_quality) + 0.5);
+     } else {
+Index: libmpcodecs/ae_lavc.c
+===================================================================
+--- a/libmpcodecs/ae_lavc.c.orig
++++ b/libmpcodecs/ae_lavc.c
+@@ -224,10 +224,10 @@ int mpae_init_lavc(audio_encoder_t *enco
+ 	}
+         if((lavc_param_audio_global_header&1)
+         /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){
+-                lavc_actx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++                lavc_actx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+         }
+         if(lavc_param_audio_global_header&2){
+-                lavc_actx->flags2 |= CODEC_FLAG2_LOCAL_HEADER;
++                lavc_actx->flags2 |= AV_CODEC_FLAG2_LOCAL_HEADER;
+         }
+ 
+ 	if(avcodec_open2(lavc_actx, lavc_acodec, NULL) < 0)
+Index: libmpcodecs/vf_mcdeint.c
+===================================================================
+--- a/libmpcodecs/vf_mcdeint.c.orig
++++ b/libmpcodecs/vf_mcdeint.c
+@@ -231,7 +231,7 @@ static int config(struct vf_instance *vf
+             avctx_enc->gop_size = 300;
+             avctx_enc->max_b_frames= 0;
+             avctx_enc->pix_fmt = AV_PIX_FMT_YUV420P;
+-            avctx_enc->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY;
++            avctx_enc->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY;
+             avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             avctx_enc->global_quality= 1;
+             av_dict_set(&opts, "memc_only", "1", 0);
+@@ -245,11 +245,11 @@ static int config(struct vf_instance *vf
+             case 2:
+                 avctx_enc->me_method= ME_ITER;
+             case 1:
+-                avctx_enc->flags |= CODEC_FLAG_4MV;
++                avctx_enc->flags |= AV_CODEC_FLAG_4MV;
+                 avctx_enc->dia_size=2;
+ //                avctx_enc->mb_decision = MB_DECISION_RD;
+             case 0:
+-                avctx_enc->flags |= CODEC_FLAG_QPEL;
++                avctx_enc->flags |= AV_CODEC_FLAG_QPEL;
+             }
+ 
+             avcodec_open2(avctx_enc, enc, &opts);
+Index: libmpcodecs/ve_lavc.c
+===================================================================
+--- a/libmpcodecs/ve_lavc.c.orig
++++ b/libmpcodecs/ve_lavc.c
+@@ -213,7 +213,7 @@ const m_option_t lavcopts_conf[]={
+ 	{"vstrict", &lavc_param_strict, CONF_TYPE_INT, CONF_RANGE, -99, 99, NULL},
+ 	{"vdpart", &lavc_param_data_partitioning, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ 	{"keyint", &lavc_param_keyint, CONF_TYPE_INT, 0, 0, 0, NULL},
+-	{"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY, NULL},
++	{"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY, NULL},
+ 	{"mpeg_quant", &lavc_param_mpeg_quant, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ 	{"vi_qfactor", &lavc_param_vi_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL},
+ 	{"vi_qoffset", &lavc_param_vi_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL},
+@@ -242,7 +242,7 @@ const m_option_t lavcopts_conf[]={
+         {"pred", &lavc_param_prediction_method, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL},
+         {"format", &lavc_param_format, CONF_TYPE_IMGFMT, 0, 0, 0, NULL},
+         {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 100000000, NULL},
+-        {"psnr", &lavc_param_psnr, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR, NULL},
++        {"psnr", &lavc_param_psnr, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR, NULL},
+         {"precmp", &lavc_param_me_pre_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
+         {"cmp", &lavc_param_me_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
+         {"subcmp", &lavc_param_me_sub_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
+@@ -251,21 +251,21 @@ const m_option_t lavcopts_conf[]={
+ #ifdef FF_CMP_VSAD
+         {"ildctcmp", &lavc_param_ildct_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
+ #endif
+-        {"bit_exact", &lavc_param_bit_exact, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_BITEXACT, NULL},
++        {"bit_exact", &lavc_param_bit_exact, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_BITEXACT, NULL},
+         {"predia", &lavc_param_pre_dia_size, CONF_TYPE_INT, CONF_RANGE, -2000, 2000, NULL},
+         {"dia", &lavc_param_dia_size, CONF_TYPE_INT, CONF_RANGE, -2000, 2000, NULL},
+-	{"qpel", &lavc_param_qpel, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL, NULL},
++	{"qpel", &lavc_param_qpel, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL, NULL},
+ 	{"trell", &lavc_param_trell, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+-	{"lowdelay", &lavc_param_lowdelay, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_LOW_DELAY, NULL},
++	{"lowdelay", &lavc_param_lowdelay, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_LOW_DELAY, NULL},
+ 	{"last_pred", &lavc_param_last_pred, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
+ 	{"preme", &lavc_param_pre_me, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
+ 	{"subq", &lavc_param_me_subpel_quality, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL},
+ 	{"me_range", &lavc_param_me_range, CONF_TYPE_INT, CONF_RANGE, 0, 16000, NULL},
+-	{"aic", &lavc_param_aic, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED, NULL},
++	{"aic", &lavc_param_aic, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED, NULL},
+ 	{"umv", &lavc_param_umv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ 	{"aiv", &lavc_param_aiv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ 	{"obmc", &lavc_param_obmc, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+-	{"loop", &lavc_param_loop, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_LOOP_FILTER, NULL},
++	{"loop", &lavc_param_loop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_LOOP_FILTER, NULL},
+ 	{"ibias", &lavc_param_ibias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL},
+ 	{"pbias", &lavc_param_pbias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL},
+ 	{"coder", &lavc_param_coder, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
+@@ -278,8 +278,8 @@ const m_option_t lavcopts_conf[]={
+ 	{"qprd", "Please use o=mpv_flags=+qp_rd instead of qprd.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+ 	{"ss", &lavc_param_ss, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ 	{"alt", &lavc_param_alt, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+-	{"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME, NULL},
+-	{"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP, NULL},
++	{"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME, NULL},
++	{"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP, NULL},
+ 	{"gmc", &lavc_param_gmc, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC, NULL},
+ 	{"dc", &lavc_param_dc_precision, CONF_TYPE_INT, CONF_RANGE, 8, 11, NULL},
+ 	{"border_mask", &lavc_param_border_masking, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
+@@ -543,7 +543,7 @@ static int config(struct vf_instance *vf
+     if (lavc_param_obmc)
+         av_dict_set(&opts, "obmc", "1", 0);
+     lavc_venc_context->flags|= lavc_param_loop;
+-    lavc_venc_context->flags|= lavc_param_v4mv ? CODEC_FLAG_4MV : 0;
++    lavc_venc_context->flags|= lavc_param_v4mv ? AV_CODEC_FLAG_4MV : 0;
+     if (lavc_param_data_partitioning)
+         av_dict_set(&opts, "data_partitioning", "1", 0);
+     lavc_venc_context->flags|= lavc_param_mv0;
+@@ -553,13 +553,13 @@ static int config(struct vf_instance *vf
+         av_dict_set(&opts, "alternate_scan", "1", 0);
+     lavc_venc_context->flags|= lavc_param_ilme;
+     lavc_venc_context->flags|= lavc_param_gmc;
+-#ifdef CODEC_FLAG_CLOSED_GOP
++#ifdef AV_CODEC_FLAG_CLOSED_GOP
+     lavc_venc_context->flags|= lavc_param_closed_gop;
+ #endif
+     lavc_venc_context->flags|= lavc_param_gray;
+ 
+     if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP;
+-    if(lavc_param_interlaced_dct) lavc_venc_context->flags|= CODEC_FLAG_INTERLACED_DCT;
++    if(lavc_param_interlaced_dct) lavc_venc_context->flags|= AV_CODEC_FLAG_INTERLACED_DCT;
+     lavc_venc_context->flags|= lavc_param_psnr;
+     lavc_venc_context->intra_dc_precision = lavc_param_dc_precision - 8;
+     lavc_venc_context->prediction_method= lavc_param_prediction_method;
+@@ -568,10 +568,10 @@ static int config(struct vf_instance *vf
+     lavc_venc_context->scenechange_factor = lavc_param_sc_factor;
+     if((lavc_param_video_global_header&1)
+        /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){
+-        lavc_venc_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
++        lavc_venc_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+     }
+     if(lavc_param_video_global_header&2){
+-        lavc_venc_context->flags2 |= CODEC_FLAG2_LOCAL_HEADER;
++        lavc_venc_context->flags2 |= AV_CODEC_FLAG2_LOCAL_HEADER;
+     }
+     lavc_venc_context->mv0_threshold = lavc_param_mv0_threshold;
+     lavc_venc_context->refs = lavc_param_refs;
+@@ -595,7 +595,7 @@ static int config(struct vf_instance *vf
+     switch(lavc_param_vpass){
+     case 2:
+     case 3:
+-	lavc_venc_context->flags|= CODEC_FLAG_PASS2;
++	lavc_venc_context->flags|= AV_CODEC_FLAG_PASS2;
+ 	stats_file= fopen(passtmpfile, "rb");
+ 	if(stats_file==NULL){
+ 	    mp_msg(MSGT_MENCODER,MSGL_ERR,"2pass failed: filename=%s\n", passtmpfile);
+@@ -618,7 +618,7 @@ static int config(struct vf_instance *vf
+ 	    fclose(stats_file);
+ 	    /* fall through */
+     case 1:
+-	lavc_venc_context->flags|= CODEC_FLAG_PASS1;
++	lavc_venc_context->flags|= AV_CODEC_FLAG_PASS1;
+ 	stats_file= fopen(passtmpfile, "wb");
+ 	if(stats_file==NULL){
+ 	    mp_msg(MSGT_MENCODER,MSGL_ERR,"2pass failed: filename=%s\n", passtmpfile);
+@@ -638,8 +638,8 @@ static int config(struct vf_instance *vf
+ 	  lavc_venc_context->noise_reduction = 0; // nr=0
+ 	  lavc_venc_context->mb_decision = 0; // mbd=0 ("realtime" encoding)
+ 
+-	  lavc_venc_context->flags &= ~CODEC_FLAG_QPEL;
+-	  lavc_venc_context->flags &= ~CODEC_FLAG_4MV;
++	  lavc_venc_context->flags &= ~AV_CODEC_FLAG_QPEL;
++	  lavc_venc_context->flags &= ~AV_CODEC_FLAG_4MV;
+ 	  lavc_venc_context->trellis = 0;
+ 	  av_dict_set(&opts, "mpv_flags", "-mv0", 0);
+ 	  av_dict_set(&opts, "mpv_flags", "-qp_rd-cbp_rd", 0);
+@@ -654,7 +654,7 @@ static int config(struct vf_instance *vf
+     if (lavc_param_vqscale >= 0.0)
+     {
+ 	mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_MPCODECS_UsingConstantQscale, lavc_param_vqscale);
+-	lavc_venc_context->flags |= CODEC_FLAG_QSCALE;
++	lavc_venc_context->flags |= AV_CODEC_FLAG_QSCALE;
+         lavc_venc_context->global_quality=
+ 	vf->priv->pic->quality = (int)(FF_QP2LAMBDA * lavc_param_vqscale + 0.5);
+     }
+@@ -693,7 +693,7 @@ static int control(struct vf_instance *v
+ 
+     switch(request){
+         case VFCTRL_FLUSH_FRAMES:
+-            if(vf->priv->codec->capabilities & CODEC_CAP_DELAY)
++            if(vf->priv->codec->capabilities & AV_CODEC_CAP_DELAY)
+                 while(encode_frame(vf, NULL, MP_NOPTS_VALUE) > 0);
+             return CONTROL_TRUE;
+         default:
+Index: libmpcodecs/ve.c
+===================================================================
+--- a/libmpcodecs/ve.c.orig
++++ b/libmpcodecs/ve.c
+@@ -43,7 +43,7 @@ extern const vf_info_t ve_info_x264;
+ 
+ static const vf_info_t * const encoder_list[] = {
+ #ifdef CONFIG_FFMPEG
+-    &ve_info_lavc,
++//    &ve_info_lavc,//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps
+ #endif
+ #ifdef CONFIG_WIN32DLL
+     &ve_info_vfw,
+Index: libmpcodecs/ae.c
+===================================================================
+--- a/libmpcodecs/ae.c.orig
++++ b/libmpcodecs/ae.c
+@@ -59,9 +59,7 @@ audio_encoder_t *new_audio_encoder(muxer
+ 			break;
+ #endif
+ #ifdef CONFIG_FFMPEG
+-		case ACODEC_LAVC:
+-			ris = mpae_init_lavc(encoder);
+-			break;
++		//TODO: ACODEC_LAVC <-- has been removed here because it depends on ve_lavc which does not compile after latest FFmpeg major bumps
+ #endif
+ #ifdef CONFIG_MP3LAME
+ 		case ACODEC_VBRMP3:
+Index: libmpcodecs/vd_ffmpeg.c
+===================================================================
+--- a/libmpcodecs/vd_ffmpeg.c.orig
++++ b/libmpcodecs/vd_ffmpeg.c
+@@ -115,8 +115,7 @@ static int lavc_param_gray=0;
+ static int lavc_param_vstats=0;
+ static int lavc_param_idct_algo=0;
+ static int lavc_param_debug=0;
+-static int lavc_param_vismv=0;
+-#ifdef CODEC_FLAG2_SHOW_ALL
++#ifdef AV_CODEC_FLAG2_SHOW_ALL
+ static int lavc_param_wait_keyframe=0;
+ #endif
+ static int lavc_param_skip_top=0;
+@@ -141,24 +140,23 @@ static const mp_image_t mpi_no_picture =
+ const m_option_t lavc_decode_opts_conf[]={
+     {"bug"           , &lavc_param_workaround_bugs      , CONF_TYPE_INT     , CONF_RANGE, -1, 999999, NULL},
+     {"er"            , &lavc_param_error_resilience     , CONF_TYPE_INT     , CONF_RANGE, 0, 99, NULL},
+-    {"gray"          , &lavc_param_gray                 , CONF_TYPE_FLAG    , 0, 0, CODEC_FLAG_GRAY, NULL},
++    {"gray"          , &lavc_param_gray                 , CONF_TYPE_FLAG    , 0, 0, AV_CODEC_FLAG_GRAY, NULL},
+     {"idct"          , &lavc_param_idct_algo            , CONF_TYPE_INT     , CONF_RANGE, 0, 99, NULL},
+     {"ec"            , &lavc_param_error_concealment    , CONF_TYPE_INT     , CONF_RANGE, 0, 99, NULL},
+     {"vstats"        , &lavc_param_vstats               , CONF_TYPE_FLAG    , 0, 0, 1, NULL},
+     {"debug"         , &lavc_param_debug                , CONF_TYPE_INT     , CONF_RANGE, 0, 9999999, NULL},
+-    {"vismv"         , &lavc_param_vismv                , CONF_TYPE_INT     , CONF_RANGE, 0, 9999999, NULL},
+-#ifdef CODEC_FLAG2_SHOW_ALL
++#ifdef AV_CODEC_FLAG2_SHOW_ALL
+     {"wait_keyframe" , &lavc_param_wait_keyframe        , CONF_TYPE_FLAG    , 0, 0, 1, NULL},
+ #endif
+     {"st"            , &lavc_param_skip_top             , CONF_TYPE_INT     , CONF_RANGE, 0, 999, NULL},
+     {"sb"            , &lavc_param_skip_bottom          , CONF_TYPE_INT     , CONF_RANGE, 0, 999, NULL},
+-    {"fast"          , &lavc_param_fast                 , CONF_TYPE_FLAG    , 0, 0, CODEC_FLAG2_FAST, NULL},
++    {"fast"          , &lavc_param_fast                 , CONF_TYPE_FLAG    , 0, 0, AV_CODEC_FLAG2_FAST, NULL},
+     {"lowres"        , &lavc_param_lowres_str           , CONF_TYPE_STRING  , 0, 0, 0, NULL},
+     {"skiploopfilter", &lavc_param_skip_loop_filter_str , CONF_TYPE_STRING  , 0, 0, 0, NULL},
+     {"skipidct"      , &lavc_param_skip_idct_str        , CONF_TYPE_STRING  , 0, 0, 0, NULL},
+     {"skipframe"     , &lavc_param_skip_frame_str       , CONF_TYPE_STRING  , 0, 0, 0, NULL},
+-    {"threads"       , &lavc_param_threads              , CONF_TYPE_INT     , CONF_RANGE, 1, 16, NULL},
+-    {"bitexact"      , &lavc_param_bitexact             , CONF_TYPE_FLAG    , 0, 0, CODEC_FLAG_BITEXACT, NULL},
++    {"threads"       , &lavc_param_threads              , CONF_TYPE_INT     , CONF_RANGE, 1, 32, NULL},
++    {"bitexact"      , &lavc_param_bitexact             , CONF_TYPE_FLAG    , 0, 0, AV_CODEC_FLAG_BITEXACT, NULL},
+     {"o"             , &lavc_avopt                      , CONF_TYPE_STRING  , 0, 0, 0, NULL},
+     {NULL, NULL, 0, 0, 0, 0, NULL}
+ };
+@@ -257,9 +255,9 @@ static void set_dr_slice_settings(struct
+     // explicitly requested
+     int use_slices = vd_use_slices > 0 || (vd_use_slices <  0 && lavc_param_threads <= 1);
+ 
+-    ctx->do_slices = use_slices && (lavc_codec->capabilities & CODEC_CAP_DRAW_HORIZ_BAND);
++    ctx->do_slices = use_slices && (lavc_codec->capabilities & AV_CODEC_CAP_DRAW_HORIZ_BAND);
+ 
+-    ctx->do_dr1 = (lavc_codec->capabilities & CODEC_CAP_DR1) &&
++    ctx->do_dr1 = (lavc_codec->capabilities & AV_CODEC_CAP_DR1) &&
+         lavc_codec->id != AV_CODEC_ID_INTERPLAY_VIDEO &&
+         lavc_codec->id != AV_CODEC_ID_H264 &&
+         lavc_codec->id != AV_CODEC_ID_HEVC;
+@@ -271,12 +269,9 @@ static void set_dr_slice_settings(struct
+         ctx->do_dr1 = 1;
+         ctx->nonref_dr = 1;
+     }
+-    if (lavc_param_vismv || (lavc_param_debug & (FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP))) {
+-        ctx->do_slices = ctx->do_dr1 = 0;
+-    }
+     if(ctx->do_dr1){
+         avctx->get_buffer2 = get_buffer2;
+-    } else if (lavc_codec->capabilities & CODEC_CAP_DR1) {
++    } else if (lavc_codec->capabilities & AV_CODEC_CAP_DR1) {
+         avctx->get_buffer2 = avcodec_default_get_buffer2;
+     }
+     avctx->slice_flags = 0;
+@@ -372,9 +367,9 @@ static int init(sh_video_t *sh){
+     case 1:
+         avctx->err_recognition |= AV_EF_CAREFUL;
+     }
+-    lavc_param_gray|= CODEC_FLAG_GRAY;
+-#ifdef CODEC_FLAG2_SHOW_ALL
+-    if(!lavc_param_wait_keyframe) avctx->flags2 |= CODEC_FLAG2_SHOW_ALL;
++    lavc_param_gray|= AV_CODEC_FLAG_GRAY;
++#ifdef AV_CODEC_FLAG2_SHOW_ALL
++    if(!lavc_param_wait_keyframe) avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL;
+ #endif
+     avctx->flags2|= lavc_param_fast;
+     avctx->codec_tag= sh->format;
+@@ -383,7 +378,6 @@ static int init(sh_video_t *sh){
+     avctx->debug= lavc_param_debug;
+     if (lavc_param_debug)
+         av_log_set_level(AV_LOG_DEBUG);
+-    avctx->debug_mv= lavc_param_vismv;
+     avctx->skip_top   = lavc_param_skip_top;
+     avctx->skip_bottom= lavc_param_skip_bottom;
+     if(lavc_param_lowres_str != NULL)
+@@ -419,7 +413,7 @@ static int init(sh_video_t *sh){
+        handled here; the second case falls through to the next section. */
+         if (sh->ImageDesc) {
+             avctx->extradata_size = (*(int *)sh->ImageDesc) - sizeof(int);
+-            avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
++            avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
+             memcpy(avctx->extradata, ((int *)sh->ImageDesc)+1, avctx->extradata_size);
+             break;
+         }
+@@ -434,7 +428,7 @@ static int init(sh_video_t *sh){
+             break;
+         av_dict_set(&opts, "extern_huff", "1", 0);
+         avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih);
+-        avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
++        avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
+         memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
+ 
+ #if 0
+@@ -457,14 +451,14 @@ static int init(sh_video_t *sh){
+         if(sh->bih->biSize<sizeof(*sh->bih)+8){
+             /* only 1 packet per frame & sub_id from fourcc */
+             avctx->extradata_size= 8;
+-            avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
++            avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
+             ((uint32_t *)avctx->extradata)[0] = 0;
+             ((uint32_t *)avctx->extradata)[1] =
+                 (sh->format == mmioFOURCC('R', 'V', '1', '3')) ? 0x10003001 : 0x10000000;
+         } else {
+             /* has extra slice header (demux_rm or rm->avi streamcopy) */
+             avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih);
+-            avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
++            avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
+             memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
+         }
+ 
+@@ -475,7 +469,11 @@ static int init(sh_video_t *sh){
+         if (!sh->bih || sh->bih->biSize <= sizeof(*sh->bih))
+             break;
+         avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih);
+-        avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
++        avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
++        if (!avctx->extradata) {
++            avctx->extradata_size = 0;
++            break;
++	}
+         memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
+         break;
+     }
+Index: libmpcodecs/vf.c
+===================================================================
+--- a/libmpcodecs/vf.c.orig
++++ b/libmpcodecs/vf.c
+@@ -200,7 +200,7 @@ static const vf_info_t* const filter_lis
+     &vf_info_uspp,
+     &vf_info_fspp,
+     &vf_info_qp,
+-    &vf_info_mcdeint,
++//    &vf_info_mcdeint, //TODO: vf_mcdeint is deactivated because it doesn't build after latest FFmpeg major bumps
+ #endif
+     &vf_info_yuvcsp,
+     &vf_info_kerndeint,
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index c8966dd2f505..7f4d347dd713 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -248,6 +248,7 @@ src_prepare() {
 		printf "${ESVN_WC_REVISION}" > $svf
 	else
 		eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
+		has_version '>media-video/ffmpeg-3.5' && eapply "${FILESDIR}"/${PN}-1.3-ffmpeg4.patch
 	fi
 	if [ ! -f VERSION ] ; then
 		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index d82eb217a30b..98f0339bbb3f 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -1,6 +1,6 @@
 AUX subliminal-2.0.5-add-missing-comma.patch 1196 BLAKE2B 1042b22bf4c6f488ada97c628d98c79e6733816ffe094af9ae45be632edfd0547086911fd3e2154cc13c5ca609bb436a3d73f6825bd8242074be323cee969192 SHA512 82cabee6a7bdc701f73e7115edc975fbde8f0008dff2e4dcf7fcb27b9203dc9efd42b54aa31a632501e3e3ed405638fcb3fb273eff4bf19cbc8085d710d3763b
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
 DIST subliminal-2.0.5-r1.tar.gz 4442435 BLAKE2B ea2139bd61344d6a0cb4b48a2b75cbfd29905adc81bca25a332443725fff80bc03b58704d0e6289d44ddc26104e15744f67acb7e0e4eafae584098b02fb4c007 SHA512 b0f99c6b2fa6bc3860c86592bb428c7b4b34836df7a619b19d69b15532a68b4d05369f724131e120d4b390bd91f430aea442aef72ebc00ae8e3d31a457925eec
-EBUILD subliminal-2.0.5-r1.ebuild 2393 BLAKE2B 1c2d8a403530921a0468e8208b42444fb4911c8854edcbcd1b3c1dd7eb93ead62cc05015ceb78aef09c693be575187158c58fab908078bef06432cbb0b11387d SHA512 5cf6009a724b8cd77ba5850a02bd39b8533658c7ca0a0ccd7485e471f575fc0000eb9ff738e3f6c9de3b91a07596a228baaef5646b5f39c020c8d4fbb70d528b
-EBUILD subliminal-9999.ebuild 2204 BLAKE2B 0cb0a73a59423594a28413600c8468c498ea6c4434d84e1fe138e3640f7fa4789afc96113685533464ddd37d1345b405596652013c9ef2026f33037163e1ad9f SHA512 20522d85033a0eacdd76b0ff9483c187a0865ff93e01e20243bcd9e7a704bfa7161854537a74e4c28f1e418e2821fc2e0482282dc6b9f52e2887c742a0e73fd7
+EBUILD subliminal-2.0.5-r1.ebuild 2389 BLAKE2B 5c538500f21ebaca6df9c1cb23d735d7c733940703ed3247f8abeec51e91e02261376aa5ea3db89fb7751f7c44fd12c3e512f52fef177432e68d6885ba829c4f SHA512 5fe4340181ef24e6df3c861e2b2634b4082061c375096fcd9c63967df7f57ab083947eafe48daa3e7a2caa8995fb1d1f34c805c6019ac69f884ecb57a36b226a
+EBUILD subliminal-9999.ebuild 2200 BLAKE2B 26af25404e515d43198db94f13940e1507ae03059a1d29c2d552454b3efc3d6bb37d88339004b606fdfc5cc3e923a736da98cb5013970fbda11f9e33e1ad7208 SHA512 caf8bc3fc7c7c7a5e0deba5e7c0b41cb88c22c1e8f9697a07bd6c40ef6c6a0ed70f9b1e83e7b1149697690860e1a4385314da20127b5a5df9e86c091dff72290
 MISC metadata.xml 549 BLAKE2B 296a55c59aad7c1d33e65258eaa0481ed167e1c78fa4fa8273acf83366c7b9365f30136ed7d0ad1b71bbde76aa4d0c5e3da98f375be9ad20b76ee77c835d6947 SHA512 cccd163878caccdee339a2e19f9cd5b0954477e767284c4183f9e589c0b5fe59353dfec14982e6dea83d91fc2f2d66904f8f40a1e69c7abab4a6d6baabfdc0c4
diff --git a/media-video/subliminal/subliminal-2.0.5-r1.ebuild b/media-video/subliminal/subliminal-2.0.5-r1.ebuild
index 0d8139e55f62..4173429f438b 100644
--- a/media-video/subliminal/subliminal-2.0.5-r1.ebuild
+++ b/media-video/subliminal/subliminal-2.0.5-r1.ebuild
@@ -10,7 +10,7 @@ COMMIT_ID='dd74383d1cba82829ce720f2e439a65d13ffe7ef'
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Python library to search and download subtitles"
-HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal"
+HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal"
 SRC_URI="
 	https://github.com/Diaoul/${PN}/archive/${COMMIT_ID}.tar.gz -> ${PF}.tar.gz
 	test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild
index ca35900d1778..00acf627be88 100644
--- a/media-video/subliminal/subliminal-9999.ebuild
+++ b/media-video/subliminal/subliminal-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='xml(+)'
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python library to search and download subtitles"
-HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal"
+HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal"
 EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
 EGIT_BRANCH="develop"
 SRC_URI="test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )"