media-plugins/gst-plugins-libav: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

16 files changed, 0 insertions, 1309 deletions

diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index b2035df471c3..35414002601f 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,5 +1,2 @@
 DIST gst-libav-1.10.3.tar.xz 8535624 SHA256 9a6bc165b1862b18b98d9f1755c43806e4839a80f69ec7ea9a2dab61b65752a9 SHA512 9f394fc5a23fa887e65c851836d338f9eb55be2a981429cfa7175e1112465696b1326386ef45d675bf1186cf8f1fec50dd0861273c763aa20ab97aaa257a1907 WHIRLPOOL 0833598516fd5f71a7cc105a4508f9301aee8c5db3569010ceabd270a8059679661508e8e2ae4e6e9147212f1454868e3244d631fbaff9bdde22ca865247331a
-DIST gst-libav-1.4.5.tar.xz 5220508 SHA256 605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc SHA512 a2f9250a51440358d205ef160119498d52cf4944fe810e736e4561f2cdbb8dabad6220d6e4da507f013c42bea69ce72acc373982642278de0a03605bbcd4f75f WHIRLPOOL 075ad91101def8ee8958eaf3051390a76efa3860a4d6796b7f5f86f9b175ca493aa3094e59b24b19c59025337683178f43346e887d7b5efe46b0f9aeadcd28d2
-DIST gst-libav-1.6.3.tar.xz 7700700 SHA256 857b9c060a0337de38c6d26238c47352433c02eabf26c2f860c854dbc35bd4ab SHA512 8e5fde08921937f96814b7953e142fb9affa48b22f90ed5a5895ec2f7bdfe320c28f83a93c17c93ba933266a5163ce689c3ee803e78256b3d664516dffff7d08 WHIRLPOOL 12070c01d74bb512a62a755d77bc558b1d29d7ffefbeafc20ee193cf7ebe9b4411f6a09784f02a83ff749853e2a5cd6140a71e00631e247dccfd0cc005db98fd
-DIST gst-libav-1.8.2.tar.xz 7982640 SHA256 b5f3c7a27b39b5f5c2f0bfd546b0c655020faf6b38d27b64b346c43e5ebf687a SHA512 7224bc11b640f770864568262b0e21af2282d692e115148bb621405d350aa3c56c5ee23d542aaebd3729111e293b92aeacd4863b83d2f801fb9d59171eb9a61c WHIRLPOOL 8fc82f33d86b7c393408ba72d86a2ce906093e7699009edf1c954d82e3524e2a15f3ebf7e0cff863a77d757fc399cc781f377ea0d8f3bf66ae5a19dd2d1c8722
 DIST gst-libav-1.8.3.tar.xz 7958532 SHA256 9006a05990089f7155ee0e848042f6bb24e52ab1d0a59ff8d1b5d7e33001a495 SHA512 49aa96197cd32ad31e280870495d64cdfe4bde67507e9cb166b80d0c394b510e734befa3ff13d6fe0711be0ffa24dd0a63a77fb62af91ab776d9844059cb839d WHIRLPOOL 0109f897ce7d42d21b467b42a661f02900896ea90c085f731b1c69de9c4913de36f3d48544db6fd44a5b828614947b6b9b1d851af2c5f739fbb537ac3022af88
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-allocate-buffer.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-allocate-buffer.patch
deleted file mode 100644
index 72c69dbcec13..000000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-allocate-buffer.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 055ae13e08ed1af220001de7b55d5c9defe64476 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Mon, 9 Mar 2015 22:01:43 +0100
-Subject: avviddec: Error out if we try to allocate a buffer without being
- negotiated
-
-Otherwise we just run into assertions because we should've errored out
-already.
-
-diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
-index 5a1b7ed..23f9c74 100644
---- a/ext/libav/gstavviddec.c
-+++ b/ext/libav/gstavviddec.c
-@@ -1114,6 +1114,9 @@ get_output_buffer (GstFFMpegVidDec * ffmpegdec, GstVideoCodecFrame * frame)
- 
-   GST_LOG_OBJECT (ffmpegdec, "get output buffer");
- 
-+  if (!ffmpegdec->output_state)
-+    goto not_negotiated;
-+
-   ret =
-       gst_video_decoder_allocate_output_frame (GST_VIDEO_DECODER (ffmpegdec),
-       frame);
-@@ -1154,9 +1157,14 @@ get_output_buffer (GstFFMpegVidDec * ffmpegdec, GstVideoCodecFrame * frame)
-   /* special cases */
- alloc_failed:
-   {
--    GST_DEBUG_OBJECT (ffmpegdec, "pad_alloc failed");
-+    GST_DEBUG_OBJECT (ffmpegdec, "allocation failed");
-     return ret;
-   }
-+not_negotiated:
-+  {
-+    GST_DEBUG_OBJECT (ffmpegdec, "not negotiated");
-+    return GST_FLOW_NOT_NEGOTIATED;
-+  }
- }
- 
- static void
--- 
-cgit v0.10.2
-
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-fix-memleak.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-fix-memleak.patch
deleted file mode 100644
index 60c0a0fe831a..000000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-fix-memleak.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 98f0b80c8d0ff5da7b3dc579a0230e9efeae87fd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Tue, 2 Jun 2015 09:09:09 +0200
-Subject: avauddev: Unref decoded AVFrame after we're done with it
-
-Otherwise we might leak some memory, like all compressed data when using
-avdec_ac3.
-
-diff --git a/ext/libav/gstavauddec.c b/ext/libav/gstavauddec.c
-index dd32466..bf16857 100644
---- a/ext/libav/gstavauddec.c
-+++ b/ext/libav/gstavauddec.c
-@@ -590,6 +590,7 @@ gst_ffmpegauddec_audio_frame (GstFFMpegAudDec * ffmpegdec,
-   }
- 
- beach:
-+  av_frame_unref (&frame);
-   GST_DEBUG_OBJECT (ffmpegdec, "return flow %d, out %p, len %d",
-       *ret, *outbuf, len);
-   return len;
--- 
-cgit v0.10.2
-
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-h265-fixes.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-h265-fixes.patch
deleted file mode 100644
index a00bc14783e6..000000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-h265-fixes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ac54ee0473f71e0c7fc195883b9ac6ae15f302af Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Fri, 5 Jun 2015 11:57:37 +0200
-Subject: avviddec: Release stream lock while calling avcodec_decode_video2()
-
-It might call back into us from another thread and try to take
-the stream lock again, e.g. to allocate a buffer. Fixes avdec_h265
-not outputting anything.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=726020
-
-diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
-index e2d8245..b876b18 100644
---- a/ext/libav/gstavviddec.c
-+++ b/ext/libav/gstavviddec.c
-@@ -1246,8 +1246,15 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
-     GST_DEBUG_OBJECT (ffmpegdec, "copy pal %p %p", &packet, pal);
-   }
- 
-+  /* This might call into get_buffer() from another thread,
-+   * which would cause a deadlock. Release the lock here
-+   * and taking it again later seems safe
-+   * See https://bugzilla.gnome.org/show_bug.cgi?id=726020
-+   */
-+  GST_VIDEO_DECODER_STREAM_UNLOCK (ffmpegdec);
-   len = avcodec_decode_video2 (ffmpegdec->context,
-       ffmpegdec->picture, have_data, &packet);
-+  GST_VIDEO_DECODER_STREAM_LOCK (ffmpegdec);
- 
-   GST_DEBUG_OBJECT (ffmpegdec, "after decode: len %d, have_data %d",
-       len, *have_data);
--- 
-cgit v0.10.2
-
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-libav9.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-libav9.patch
deleted file mode 100644
index a1a4f90db0cd..000000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-libav9.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-Add compatibility for libav-9 not to require still hardmasked libav-10.
-aballier@gentoo.org
-
-
-Index: work/gst-libav-1.4.5/ext/libav/gstavauddec.c
-===================================================================
---- work.orig/gst-libav-1.4.5/ext/libav/gstavauddec.c
-+++ work/gst-libav-1.4.5/ext/libav/gstavauddec.c
-@@ -582,9 +582,11 @@ gst_ffmpegauddec_audio_frame (GstFFMpegA
-           ffmpegdec->info.position);
-     }
- 
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,17,0)
-     /* Mark corrupted frames as corrupted */
-     if (frame.flags & AV_FRAME_FLAG_CORRUPT)
-       GST_BUFFER_FLAG_SET (*outbuf, GST_BUFFER_FLAG_CORRUPTED);
-+#endif
-   } else {
-     *outbuf = NULL;
-   }
-Index: work/gst-libav-1.4.5/ext/libav/gstavcodecmap.c
-===================================================================
---- work.orig/gst-libav-1.4.5/ext/libav/gstavcodecmap.c
-+++ work/gst-libav-1.4.5/ext/libav/gstavcodecmap.c
-@@ -1206,6 +1206,7 @@ gst_ffmpeg_codecid_to_caps (enum AVCodec
-       }
-       break;
- 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,41,0)
-     case AV_CODEC_ID_HEVC:
-       caps =
-           gst_ff_vid_caps_new (context, NULL, codec_id, encode, "video/x-h265",
-@@ -1226,6 +1227,7 @@ gst_ffmpeg_codecid_to_caps (enum AVCodec
-         g_value_unset (&arr);
-       }
-       break;
-+#endif
- 
-     case AV_CODEC_ID_INDEO5:
-       caps =
-@@ -1706,11 +1708,13 @@ gst_ffmpeg_codecid_to_caps (enum AVCodec
-       }
-       break;
- 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,5,0)
-     case AV_CODEC_ID_AIC:
-       caps =
-           gst_ff_vid_caps_new (context, NULL, codec_id, encode,
-           "video/x-apple-intermediate-codec", NULL);
-       break;
-+#endif
- 
-     case AV_CODEC_ID_WS_VQA:
-     case AV_CODEC_ID_IDCIN:
-@@ -3760,9 +3764,11 @@ gst_ffmpeg_caps_to_codecid (const GstCap
-       id = AV_CODEC_ID_FFV1;
-       video = TRUE;
-     }
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,5,0)
-   } else if (!strcmp (mimetype, "video/x-apple-intermediate-codec")) {
-     id = AV_CODEC_ID_AIC;
-     video = TRUE;
-+#endif
-   } else if (!strcmp (mimetype, "audio/x-adpcm")) {
-     const gchar *layout;
- 
-@@ -3924,9 +3930,11 @@ gst_ffmpeg_caps_to_codecid (const GstCap
-   } else if (!strcmp (mimetype, "video/x-h264")) {
-     id = AV_CODEC_ID_H264;
-     video = TRUE;
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,41,0)
-   } else if (!strcmp (mimetype, "video/x-h265")) {
-     id = AV_CODEC_ID_HEVC;
-     video = TRUE;
-+#endif
-   } else if (!strcmp (mimetype, "video/x-flash-video")) {
-     gint flvversion = 0;
- 
-Index: work/gst-libav-1.4.5/ext/libav/gstavviddec.c
-===================================================================
---- work.orig/gst-libav-1.4.5/ext/libav/gstavviddec.c
-+++ work/gst-libav-1.4.5/ext/libav/gstavviddec.c
-@@ -368,8 +368,10 @@ gst_ffmpegviddec_open (GstFFMpegVidDec *
-       break;
-   }
- 
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,17,0)
-   gst_ffmpegviddec_context_set_flags (ffmpegdec->context,
-       CODEC_FLAG_OUTPUT_CORRUPT, ffmpegdec->output_corrupt);
-+#endif
- 
-   return TRUE;
- 
-@@ -733,17 +735,21 @@ invalid_frame:
- fallback:
-   {
-     int c;
-+#if LIBAVUTIL_VERSION_MAJOR >= 53
-     gboolean first = TRUE;
-+#endif
-     int ret = avcodec_default_get_buffer (context, picture);
- 
-     for (c = 0; c < AV_NUM_DATA_POINTERS; c++) {
-       ffmpegdec->stride[c] = picture->linesize[c];
- 
-+#if LIBAVUTIL_VERSION_MAJOR >= 53
-       if (picture->buf[c] == NULL && first) {
-         picture->buf[c] =
-             av_buffer_create (NULL, 0, dummy_free_buffer, dframe, 0);
-         first = FALSE;
-       }
-+#endif
-     }
- 
-     return ret;
-@@ -1280,8 +1286,10 @@ gst_ffmpegviddec_video_frame (GstFFMpegV
-       ffmpegdec->picture->repeat_pict);
-   GST_DEBUG_OBJECT (ffmpegdec, "interlaced_frame:%d (current:%d)",
-       ffmpegdec->picture->interlaced_frame, ffmpegdec->ctx_interlaced);
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,17,0)
-   GST_DEBUG_OBJECT (ffmpegdec, "corrupted frame: %d",
-       ! !(ffmpegdec->picture->flags & AV_FRAME_FLAG_CORRUPT));
-+#endif
- 
-   if (G_UNLIKELY (ffmpegdec->picture->interlaced_frame !=
-           ffmpegdec->ctx_interlaced)) {
-@@ -1298,9 +1306,11 @@ gst_ffmpegviddec_video_frame (GstFFMpegV
-   if (G_UNLIKELY (*ret != GST_FLOW_OK))
-     goto no_output;
- 
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,17,0)
-   /* Mark corrupted frames as corrupted */
-   if (ffmpegdec->picture->flags & AV_FRAME_FLAG_CORRUPT)
-     GST_BUFFER_FLAG_SET (out_frame->output_buffer, GST_BUFFER_FLAG_CORRUPTED);
-+#endif
- 
-   if (ffmpegdec->ctx_interlaced) {
-     /* set interlaced flags */
-@@ -1980,7 +1990,9 @@ gst_ffmpegviddec_register (GstPlugin * p
-       case AV_CODEC_ID_MPEG4:
-       case AV_CODEC_ID_MSMPEG4V3:
-       case AV_CODEC_ID_H264:
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,41,0)
-       case AV_CODEC_ID_HEVC:
-+#endif
-       case AV_CODEC_ID_RV10:
-       case AV_CODEC_ID_RV20:
-       case AV_CODEC_ID_RV30:
-Index: work/gst-libav-1.4.5/ext/libav/gstavaudenc.c
-===================================================================
---- work.orig/gst-libav-1.4.5/ext/libav/gstavaudenc.c
-+++ work/gst-libav-1.4.5/ext/libav/gstavaudenc.c
-@@ -409,7 +409,11 @@ gst_ffmpegaudenc_set_format (GstAudioEnc
- static void
- gst_ffmpegaudenc_free_avpacket (gpointer pkt)
- {
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,16,0)
-   av_packet_unref ((AVPacket *) pkt);
-+#else
-+  av_destruct_packet ((AVPacket *) pkt);
-+#endif
-   g_slice_free (AVPacket, pkt);
- }
- 
-Index: work/gst-libav-1.4.5/ext/libav/gstavvidenc.c
-===================================================================
---- work.orig/gst-libav-1.4.5/ext/libav/gstavvidenc.c
-+++ work/gst-libav-1.4.5/ext/libav/gstavvidenc.c
-@@ -576,7 +576,11 @@ gst_ffmpegvidenc_propose_allocation (Gst
- static void
- gst_ffmpegvidenc_free_avpacket (gpointer pkt)
- {
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,16,0)
-   av_packet_unref ((AVPacket *) pkt);
-+#else
-+  av_destruct_packet ((AVPacket *) pkt);
-+#endif
-   g_slice_free (AVPacket, pkt);
- }
- 
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-post-error.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-post-error.patch
deleted file mode 100644
index 470302046cdf..000000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-post-error.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 07d185161ea5d543f2ae1c6485da79dd7ee01173 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
-Date: Tue, 2 Jun 2015 20:48:33 -0400
-Subject: avviddec: Post error message before returning a flow error
-
-This is required.
-
-diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
-index 23f9c74..e2d8245 100644
---- a/ext/libav/gstavviddec.c
-+++ b/ext/libav/gstavviddec.c
-@@ -1479,7 +1479,8 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder,
-       GST_TIME_ARGS (frame->pts), GST_TIME_ARGS (frame->duration));
- 
-   if (!gst_buffer_map (frame->input_buffer, &minfo, GST_MAP_READ)) {
--    GST_ERROR_OBJECT (ffmpegdec, "Failed to map buffer");
-+    GST_ELEMENT_ERROR (ffmpegdec, STREAM, DECODE, ("Decoding problem"),
-+        ("Failed to map buffer for reading"));
-     return GST_FLOW_ERROR;
-   }
- 
--- 
-cgit v0.10.2
-
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-bitrate.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-bitrate.patch
deleted file mode 100644
index 4c0510aa3f1e..000000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-bitrate.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit 46fb2e9f11820190f2e173f4ebd83f0d15adea40
-Author: Sebastian Dröge <sebastian@centricular.com>
-Date:   Sat Jan 16 16:40:52 2016 +0200
-
-    libav: Bitrate field changed from int to int64_t, fix compiler warnings
-    
-    Cast it to a gint64 for now though, as otherwise we will fail compilation
-    with ffmpeg 2.8.
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=757498
-
-diff --git a/ext/libav/gstavaudenc.c b/ext/libav/gstavaudenc.c
-index 64d7011..9a8e690 100644
---- a/ext/libav/gstavaudenc.c
-+++ b/ext/libav/gstavaudenc.c
-@@ -269,8 +269,9 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info)
-     ffmpegaudenc->context->bit_rate = ffmpegaudenc->bitrate;
-     ffmpegaudenc->context->bit_rate_tolerance = ffmpegaudenc->bitrate;
-   } else {
--    GST_INFO_OBJECT (ffmpegaudenc, "Using avcontext default bitrate %d",
--        ffmpegaudenc->context->bit_rate);
-+    GST_INFO_OBJECT (ffmpegaudenc,
-+        "Using avcontext default bitrate %" G_GINT64_FORMAT,
-+        (gint64) ffmpegaudenc->context->bit_rate);
-   }
- 
-   /* RTP payload used for GOB production (for Asterisk) */
-diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
-index 2f8dc8a..966c9b8 100644
---- a/ext/libav/gstavcodecmap.c
-+++ b/ext/libav/gstavcodecmap.c
-@@ -2357,6 +2357,7 @@ gst_ffmpeg_caps_to_smpfmt (const GstCaps * caps,
-   GstStructure *structure;
-   const gchar *fmt;
-   GstAudioFormat format = GST_AUDIO_FORMAT_UNKNOWN;
-+  gint bitrate;
- 
-   g_return_if_fail (gst_caps_get_size (caps) == 1);
- 
-@@ -2365,7 +2366,8 @@ gst_ffmpeg_caps_to_smpfmt (const GstCaps * caps,
-   gst_structure_get_int (structure, "channels", &context->channels);
-   gst_structure_get_int (structure, "rate", &context->sample_rate);
-   gst_structure_get_int (structure, "block_align", &context->block_align);
--  gst_structure_get_int (structure, "bitrate", &context->bit_rate);
-+  gst_structure_get_int (structure, "bitrate", &bitrate);
-+  context->bit_rate = bitrate;
- 
-   if (!raw)
-     return;
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-chain-dispose.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-chain-dispose.patch
deleted file mode 100644
index de8947a305fd..000000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-chain-dispose.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit e04bcf0601286990d0fa2dd9999fcfcff1b5784b
-Author: Sebastian Dröge <sebastian@centricular.com>
-Date:   Sat Jan 16 16:43:16 2016 +0200
-
-    avdeinterlace: Chain up to parent class' dispose()
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=757498
-
-diff --git a/ext/libav/gstavdeinterlace.c b/ext/libav/gstavdeinterlace.c
-index fe2d60d..6bdc605 100644
---- a/ext/libav/gstavdeinterlace.c
-+++ b/ext/libav/gstavdeinterlace.c
-@@ -310,7 +310,10 @@ static void
- gst_ffmpegdeinterlace_dispose (GObject * obj)
- {
-   GstFFMpegDeinterlace *deinterlace = GST_FFMPEGDEINTERLACE (obj);
-+
-   delete_filter_graph (deinterlace);
-+
-+  G_OBJECT_CLASS (gst_ffmpegdeinterlace_parent_class)->dispose (obj);
- }
- 
- static int
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-deinterlace-lavf.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-deinterlace-lavf.patch
deleted file mode 100644
index f53c8547b003..000000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-deinterlace-lavf.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-commit ddec3a2c78dd317efc1e9bc3ec0b2c49bf31ae77
-Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-Date:   Wed Nov 4 21:16:18 2015 +0100
-
-    avdeinterlace: Port non-deprecated AVFilter API
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=757498
-
-diff --git a/configure.ac b/configure.ac
-index 19fa183..4d6fe94 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -280,7 +280,7 @@ AC_ARG_WITH(system-libav,
-             [AC_HELP_STRING([--with-system-libav], [use system Libav libraries])])
- 
- if test "x$with_system_libav" = "xyes"; then
--  PKG_CHECK_MODULES(LIBAV, libavformat libavcodec libavutil)
-+  PKG_CHECK_MODULES(LIBAV, libavfilter libavformat libavcodec libavutil)
-   PKG_CHECK_MODULES(SWSCALE, libswscale libavutil)
-   saved_CPPFLAGS="$CPPFLAGS"
-   CPPFLAGS="$CPPFLAGS $LIBAV_CFLAGS"
-@@ -313,6 +313,7 @@ else
- 
-   LIBAV_DEPS="\$(top_builddir)/gst-libs/ext/libav/libavformat/libavformat.a \
-               \$(top_builddir)/gst-libs/ext/libav/libavcodec/libavcodec.a \
-+              \$(top_builddir)/gst-libs/ext/libav/libavfilter/libavfilter.a \
-               \$(top_builddir)/gst-libs/ext/libav/libswresample/libswresample.a \
-               \$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a"
-   if test "x$enable_static_plugins" = xyes; then
-@@ -357,7 +358,7 @@ else
-   # Enable pic and static so that we get .a files, but with PIC code.
-   emblibav_configure_args="$emblibav_configure_args \
-         --enable-static --enable-pic \
--        --disable-avdevice --disable-postproc --disable-avfilter \
-+        --disable-avdevice --disable-postproc \
-         --disable-programs --disable-ffserver --disable-ffplay --disable-ffprobe --disable-ffmpeg \
-         --disable-encoder=flac --disable-protocols --disable-devices \
-         --disable-network --disable-hwaccels --disable-dxva2 --disable-vdpau \
-diff --git a/ext/libav/gstavdeinterlace.c b/ext/libav/gstavdeinterlace.c
-index 2d142a6..6906059 100644
---- a/ext/libav/gstavdeinterlace.c
-+++ b/ext/libav/gstavdeinterlace.c
-@@ -25,6 +25,9 @@
- #endif
- 
- #include <libavcodec/avcodec.h>
-+#include <libavfilter/avfilter.h>
-+#include <libavfilter/buffersrc.h>
-+#include <libavfilter/buffersink.h>
- 
- #include <gst/gst.h>
- #include <gst/video/video.h>
-@@ -93,6 +96,14 @@ typedef struct _GstFFMpegDeinterlace
- 
-   enum PixelFormat pixfmt;
-   AVPicture from_frame, to_frame;
-+
-+  AVFilterContext *buffersink_ctx;
-+  AVFilterContext *buffersrc_ctx;
-+  AVFilterGraph *filter_graph;
-+  AVFrame *filter_frame;
-+  int last_width, last_height;
-+  enum AVPixelFormat last_pixfmt;
-+
- } GstFFMpegDeinterlace;
- 
- typedef struct _GstFFMpegDeinterlaceClass
-@@ -135,6 +146,8 @@ G_DEFINE_TYPE (GstFFMpegDeinterlace, gst_ffmpegdeinterlace, GST_TYPE_ELEMENT);
- static GstFlowReturn gst_ffmpegdeinterlace_chain (GstPad * pad,
-     GstObject * parent, GstBuffer * inbuf);
- 
-+static void gst_ffmpegdeinterlace_dispose (GObject * obj);
-+
- static void
- gst_ffmpegdeinterlace_class_init (GstFFMpegDeinterlaceClass * klass)
- {
-@@ -167,6 +180,8 @@ gst_ffmpegdeinterlace_class_init (GstFFMpegDeinterlaceClass * klass)
-   gst_element_class_set_static_metadata (element_class,
-       "libav Deinterlace element", "Filter/Effect/Video/Deinterlace",
-       "Deinterlace video", "Luca Ognibene <luogni@tin.it>");
-+
-+  gobject_class->dispose = gst_ffmpegdeinterlace_dispose;
- }
- 
- static void
-@@ -277,6 +292,101 @@ gst_ffmpegdeinterlace_init (GstFFMpegDeinterlace * deinterlace)
-   deinterlace->reconfigure = FALSE;
-   deinterlace->mode = DEFAULT_MODE;
-   deinterlace->new_mode = -1;
-+  deinterlace->last_width = -1;
-+  deinterlace->last_height = -1;
-+  deinterlace->last_pixfmt = AV_PIX_FMT_NONE;
-+}
-+
-+static void
-+delete_filter_graph (GstFFMpegDeinterlace * deinterlace)
-+{
-+  if (deinterlace->filter_graph) {
-+    av_frame_free (&deinterlace->filter_frame);
-+    avfilter_graph_free (&deinterlace->filter_graph);
-+  }
-+}
-+
-+static void
-+gst_ffmpegdeinterlace_dispose (GObject * obj)
-+{
-+  GstFFMpegDeinterlace *deinterlace = GST_FFMPEGDEINTERLACE (obj);
-+  delete_filter_graph (deinterlace);
-+}
-+
-+static int
-+init_filter_graph (GstFFMpegDeinterlace * deinterlace,
-+    enum AVPixelFormat pixfmt, int width, int height)
-+{
-+  AVFilterInOut *inputs = NULL, *outputs = NULL;
-+  char args[512];
-+  int res;
-+
-+  delete_filter_graph (deinterlace);
-+  deinterlace->filter_graph = avfilter_graph_alloc ();
-+  snprintf (args, sizeof (args),
-+      "buffer=video_size=%dx%d:pix_fmt=%d:time_base=1/1:pixel_aspect=0/1[in];"
-+      "[in]yadif[out];" "[out]buffersink", width, height, pixfmt);
-+  res =
-+      avfilter_graph_parse2 (deinterlace->filter_graph, args, &inputs,
-+      &outputs);
-+  if (res < 0)
-+    return res;
-+  if (inputs || outputs)
-+    return -1;
-+  res = avfilter_graph_config (deinterlace->filter_graph, NULL);
-+  if (res < 0)
-+    return res;
-+
-+  deinterlace->buffersrc_ctx =
-+      avfilter_graph_get_filter (deinterlace->filter_graph, "Parsed_buffer_0");
-+  deinterlace->buffersink_ctx =
-+      avfilter_graph_get_filter (deinterlace->filter_graph,
-+      "Parsed_buffersink_2");
-+  if (!deinterlace->buffersrc_ctx || !deinterlace->buffersink_ctx)
-+    return -1;
-+  deinterlace->filter_frame = av_frame_alloc ();
-+  deinterlace->last_width = width;
-+  deinterlace->last_height = height;
-+  deinterlace->last_pixfmt = pixfmt;
-+
-+  return 0;
-+}
-+
-+static int
-+process_filter_graph (GstFFMpegDeinterlace * deinterlace, AVPicture * dst,
-+    const AVPicture * src, enum AVPixelFormat pixfmt, int width, int height)
-+{
-+  int res;
-+
-+  if (!deinterlace->filter_graph || width != deinterlace->last_width ||
-+      height != deinterlace->last_height
-+      || pixfmt != deinterlace->last_pixfmt) {
-+    res = init_filter_graph (deinterlace, pixfmt, width, height);
-+    if (res < 0)
-+      return res;
-+  }
-+
-+  memcpy (deinterlace->filter_frame->data, src->data, sizeof (src->data));
-+  memcpy (deinterlace->filter_frame->linesize, src->linesize,
-+      sizeof (src->linesize));
-+  deinterlace->filter_frame->width = width;
-+  deinterlace->filter_frame->height = height;
-+  deinterlace->filter_frame->format = pixfmt;
-+  res =
-+      av_buffersrc_add_frame (deinterlace->buffersrc_ctx,
-+      deinterlace->filter_frame);
-+  if (res < 0)
-+    return res;
-+  res =
-+      av_buffersink_get_frame (deinterlace->buffersink_ctx,
-+      deinterlace->filter_frame);
-+  if (res < 0)
-+    return res;
-+  av_picture_copy (dst, (const AVPicture *) deinterlace->filter_frame, pixfmt,
-+      width, height);
-+  av_frame_unref (deinterlace->filter_frame);
-+
-+  return 0;
- }
- 
- static GstFlowReturn
-@@ -320,8 +430,9 @@ gst_ffmpegdeinterlace_chain (GstPad * pad, GstObject * parent,
-   gst_ffmpeg_avpicture_fill (&deinterlace->to_frame, to_map.data,
-       deinterlace->pixfmt, deinterlace->width, deinterlace->height);
- 
--  avpicture_deinterlace (&deinterlace->to_frame, &deinterlace->from_frame,
--      deinterlace->pixfmt, deinterlace->width, deinterlace->height);
-+  process_filter_graph (deinterlace, &deinterlace->to_frame,
-+      &deinterlace->from_frame, deinterlace->pixfmt, deinterlace->width,
-+      deinterlace->height);
-   gst_buffer_unmap (outbuf, &to_map);
-   gst_buffer_unmap (inbuf, &from_map);
- 
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-minr-compat.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-minr-compat.patch
deleted file mode 100644
index 70b2e0a29cbb..000000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-minr-compat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Preserve compatibility with ffmpeg 2.8 for rc-min-rate option.
-
-Index: gst-libav-1.6.3/ext/libav/gstavcfg.c
-===================================================================
---- gst-libav-1.6.3.orig/ext/libav/gstavcfg.c
-+++ gst-libav-1.6.3/ext/libav/gstavcfg.c
-@@ -524,9 +524,15 @@ gst_ffmpeg_cfg_init (void)
- #endif
-   gst_ffmpeg_add_pspec (pspec, config.rc_max_rate, FALSE, mpeg, NULL);
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT (57, 3, 0)
-+  pspec = g_param_spec_int ("rc-min-rate", "Ratecontrol Minimum Bitrate",
-+      "Ratecontrol Minimum Bitrate", 0, G_MAXINT, 0,
-+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-+#else
-   pspec = g_param_spec_int64 ("rc-min-rate", "Ratecontrol Minimum Bitrate",
-       "Ratecontrol Minimum Bitrate", 0, G_MAXINT64, 0,
-       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-+#endif
-   gst_ffmpeg_add_pspec (pspec, config.rc_min_rate, FALSE, mpeg, NULL);
- 
-   pspec =
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-minr-maxr.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-minr-maxr.patch
deleted file mode 100644
index a3b4a9147c79..000000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-minr-maxr.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-commit e3cf542215519f882b7570a4b59aad75a8d2d27a
-Author: Edward Hervey <edward@centricular.com>
-Date:   Tue Feb 16 16:32:38 2016 +0100
-
-    avcfg: rc-min-rate and rc-max-rate are now 64bit integers
-    
-    Switch the gobject properties and internal handling to support that
-
-diff --git a/ext/libav/gstavcfg.c b/ext/libav/gstavcfg.c
-index d38cce1..a361994 100644
---- a/ext/libav/gstavcfg.c
-+++ b/ext/libav/gstavcfg.c
-@@ -513,13 +513,19 @@ gst_ffmpeg_cfg_init (void)
-   gst_ffmpeg_add_pspec (pspec, config.rc_buffer_aggressivity, FALSE, mpeg,
-       NULL);
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT (57, 3, 0)
-   pspec = g_param_spec_int ("rc-max-rate", "Ratecontrol Maximum Bitrate",
-       "Ratecontrol Maximum Bitrate", 0, G_MAXINT, 0,
-       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-+#else
-+  pspec = g_param_spec_int64 ("rc-max-rate", "Ratecontrol Maximum Bitrate",
-+      "Ratecontrol Maximum Bitrate", 0, G_MAXINT64, 0,
-+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-+#endif
-   gst_ffmpeg_add_pspec (pspec, config.rc_max_rate, FALSE, mpeg, NULL);
- 
--  pspec = g_param_spec_int ("rc-min-rate", "Ratecontrol Minimum Bitrate",
--      "Ratecontrol Minimum Bitrate", 0, G_MAXINT, 0,
-+  pspec = g_param_spec_int64 ("rc-min-rate", "Ratecontrol Minimum Bitrate",
-+      "Ratecontrol Minimum Bitrate", 0, G_MAXINT64, 0,
-       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-   gst_ffmpeg_add_pspec (pspec, config.rc_min_rate, FALSE, mpeg, NULL);
- 
-@@ -770,6 +776,15 @@ gst_ffmpeg_cfg_install_property (GstFFMpegVidEncClass * klass, guint base)
-               : pint->default_value, pspec->flags);
-           break;
-         }
-+        case G_TYPE_INT64:{
-+          GParamSpecInt64 *pint = G_PARAM_SPEC_INT64 (pspec);
-+
-+          pspec = g_param_spec_int64 (name, nick, blurb,
-+              pint->minimum, pint->maximum,
-+              lavc_default ? G_STRUCT_MEMBER (gint64, ctx, ctx_offset)
-+              : pint->default_value, pspec->flags);
-+          break;
-+        }
-         case G_TYPE_UINT:{
-           GParamSpecUInt *puint = G_PARAM_SPEC_UINT (pspec);
- 
-@@ -862,6 +877,11 @@ gst_ffmpeg_cfg_set_property (GObject * object,
-       G_STRUCT_MEMBER (gint, ffmpegenc, qdata->offset) =
-           g_value_get_int (value);
-       break;
-+    case G_TYPE_INT64:
-+      g_return_val_if_fail (qdata->size == sizeof (gint64), TRUE);
-+      G_STRUCT_MEMBER (gint64, ffmpegenc, qdata->offset) =
-+          g_value_get_int64 (value);
-+      break;
-     case G_TYPE_FLOAT:
-       g_return_val_if_fail (qdata->size == sizeof (gfloat), TRUE);
-       G_STRUCT_MEMBER (gfloat, ffmpegenc, qdata->offset) =
-@@ -924,6 +944,11 @@ gst_ffmpeg_cfg_get_property (GObject * object,
-       g_return_val_if_fail (qdata->size == sizeof (gint), TRUE);
-       g_value_set_int (value, G_STRUCT_MEMBER (gint, ffmpegenc, qdata->offset));
-       break;
-+    case G_TYPE_INT64:
-+      g_return_val_if_fail (qdata->size == sizeof (gint64), TRUE);
-+      g_value_set_int64 (value, G_STRUCT_MEMBER (gint64, ffmpegenc,
-+              qdata->offset));
-+      break;
-     case G_TYPE_FLOAT:
-       g_return_val_if_fail (qdata->size == sizeof (gfloat), TRUE);
-       g_value_set_float (value,
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-no-deprecated.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-no-deprecated.patch
deleted file mode 100644
index 578853399f1e..000000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.6.3-no-deprecated.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-commit 6235a04ef356f8d7e2f933758ddba359fa95a5ec
-Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-Date:   Wed Nov 4 21:18:56 2015 +0100
-
-    libav: Remove usage of deprecated API
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=757498
-
-diff --git a/ext/libav/gstavcfg.c b/ext/libav/gstavcfg.c
-index a85f547..d38cce1 100644
---- a/ext/libav/gstavcfg.c
-+++ b/ext/libav/gstavcfg.c
-@@ -173,13 +173,10 @@ gst_ffmpeg_idct_algo_get_type (void)
-       {FF_IDCT_SIMPLEMMX, "Simple MMX", "simplemmx"},
-       {FF_IDCT_ARM, "ARM", "arm"},
-       {FF_IDCT_ALTIVEC, "Altivec", "altivec"},
--      {FF_IDCT_SH4, "SH4", "sh4"},
-       {FF_IDCT_SIMPLEARM, "Simple ARM", "simplearm"},
--      {FF_IDCT_IPP, "IPP", "ipp"},
-       {FF_IDCT_XVID, "XVID", "xvid"},
-       {FF_IDCT_SIMPLEARMV5TE, "Simple ARMV5TE", "simplearmv5te"},
-       {FF_IDCT_SIMPLEARMV6, "Simple ARMV6", "simplearmv6"},
--      {FF_IDCT_SIMPLEVIS, "Simple Vis", "simplevis"},
-       {FF_IDCT_FAAN, "FAAN", "faan"},
-       {FF_IDCT_SIMPLENEON, "Simple NEON", "simpleneon"},
-       {0, NULL, NULL},
-@@ -665,7 +662,7 @@ gst_ffmpeg_cfg_init (void)
-   gst_ffmpeg_add_pspec (pspec, interlaced, FALSE, mpeg, NULL);
- 
-   pspec = g_param_spec_int ("max-bframes", "Max B-Frames",
--      "Maximum B-frames in a row", 0, FF_MAX_B_FRAMES, 0,
-+      "Maximum B-frames in a row", 0, INT_MAX, 0,
-       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-   gst_ffmpeg_add_pspec (pspec, config.max_b_frames, FALSE, mpeg, NULL);
- 
-diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
-index 11a9ed2..2f8dc8a 100644
---- a/ext/libav/gstavcodecmap.c
-+++ b/ext/libav/gstavcodecmap.c
-@@ -770,10 +770,6 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
-       }
-       break;
- 
--    case AV_CODEC_ID_MPEG2VIDEO_XVMC:
--      /* this is a special ID - don't need it in GStreamer, I think */
--      break;
--
-     case AV_CODEC_ID_H263:
-       if (encode) {
-         caps =
-@@ -2202,7 +2198,7 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
-  */
- 
- static GstCaps *
--gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context,
-+gst_ffmpeg_pixfmt_to_caps (enum AVPixelFormat pix_fmt, AVCodecContext * context,
-     enum AVCodecID codec_id)
- {
-   GstCaps *caps = NULL;
-@@ -2533,7 +2529,7 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps,
- typedef struct
- {
-   GstVideoFormat format;
--  enum PixelFormat pixfmt;
-+  enum AVPixelFormat pixfmt;
- } PixToFmt;
- 
- /* FIXME : FILLME */
-@@ -2625,7 +2621,7 @@ static const PixToFmt pixtofmttable[] = {
- };
- 
- GstVideoFormat
--gst_ffmpeg_pixfmt_to_videoformat (enum PixelFormat pixfmt)
-+gst_ffmpeg_pixfmt_to_videoformat (enum AVPixelFormat pixfmt)
- {
-   guint i;
- 
-@@ -2637,7 +2633,7 @@ gst_ffmpeg_pixfmt_to_videoformat (enum PixelFormat pixfmt)
-   return GST_VIDEO_FORMAT_UNKNOWN;
- }
- 
--static enum PixelFormat
-+static enum AVPixelFormat
- gst_ffmpeg_videoformat_to_pixfmt_for_codec (GstVideoFormat format,
-     const AVCodec * codec)
- {
-@@ -2661,7 +2657,7 @@ gst_ffmpeg_videoformat_to_pixfmt_for_codec (GstVideoFormat format,
-   return AV_PIX_FMT_NONE;
- }
- 
--enum PixelFormat
-+enum AVPixelFormat
- gst_ffmpeg_videoformat_to_pixfmt (GstVideoFormat format)
- {
-   return gst_ffmpeg_videoformat_to_pixfmt_for_codec (format, NULL);
-diff --git a/ext/libav/gstavcodecmap.h b/ext/libav/gstavcodecmap.h
-index 40f46c3..486a0d5 100644
---- a/ext/libav/gstavcodecmap.h
-+++ b/ext/libav/gstavcodecmap.h
-@@ -132,8 +132,8 @@ void
- gst_ffmpeg_audioinfo_to_context (GstAudioInfo *info,
- 				 AVCodecContext *context);
- 
--GstVideoFormat gst_ffmpeg_pixfmt_to_videoformat (enum PixelFormat pixfmt);
--enum PixelFormat gst_ffmpeg_videoformat_to_pixfmt (GstVideoFormat format);
-+GstVideoFormat gst_ffmpeg_pixfmt_to_videoformat (enum AVPixelFormat pixfmt);
-+enum AVPixelFormat gst_ffmpeg_videoformat_to_pixfmt (GstVideoFormat format);
- 
- GstAudioFormat gst_ffmpeg_smpfmt_to_audioformat (enum AVSampleFormat sample_fmt);
- 
-diff --git a/ext/libav/gstavdeinterlace.c b/ext/libav/gstavdeinterlace.c
-index 6906059..fe2d60d 100644
---- a/ext/libav/gstavdeinterlace.c
-+++ b/ext/libav/gstavdeinterlace.c
-@@ -94,7 +94,7 @@ typedef struct _GstFFMpegDeinterlace
-   gboolean reconfigure;
-   GstFFMpegDeinterlaceMode new_mode;
- 
--  enum PixelFormat pixfmt;
-+  enum AVPixelFormat pixfmt;
-   AVPicture from_frame, to_frame;
- 
-   AVFilterContext *buffersink_ctx;
-diff --git a/ext/libav/gstavutils.c b/ext/libav/gstavutils.c
-index c434202..5d1567b 100644
---- a/ext/libav/gstavutils.c
-+++ b/ext/libav/gstavutils.c
-@@ -279,7 +279,7 @@ gst_ffmpeg_avpicture_get_size (int pix_fmt, int width, int height)
- 
- int
- gst_ffmpeg_avpicture_fill (AVPicture * picture,
--    uint8_t * ptr, enum PixelFormat pix_fmt, int width, int height)
-+    uint8_t * ptr, enum AVPixelFormat pix_fmt, int width, int height)
- {
-   int size, w2, h2, size2;
-   int stride, stride2;
-diff --git a/ext/libav/gstavutils.h b/ext/libav/gstavutils.h
-index 6d111a2..f4d90ef 100644
---- a/ext/libav/gstavutils.h
-+++ b/ext/libav/gstavutils.h
-@@ -42,7 +42,7 @@ gst_ffmpeg_avpicture_get_size (int pix_fmt, int width, int height);
- int
- gst_ffmpeg_avpicture_fill (AVPicture * picture,
-                            uint8_t *   ptr,
--                           enum PixelFormat pix_fmt,
-+                           enum AVPixelFormat pix_fmt,
-                            int         width,
-                            int         height);
- 
-diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
-index da9acf6..cc0cf03 100644
---- a/ext/libav/gstavviddec.c
-+++ b/ext/libav/gstavviddec.c
-@@ -444,9 +444,6 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
- 
-   /* set buffer functions */
-   ffmpegdec->context->get_buffer2 = gst_ffmpegviddec_get_buffer2;
--  ffmpegdec->context->get_buffer = NULL;
--  ffmpegdec->context->reget_buffer = NULL;
--  ffmpegdec->context->release_buffer = NULL;
-   ffmpegdec->context->draw_horiz_band = NULL;
- 
-   /* reset coded_width/_height to prevent it being reused from last time when
-@@ -825,10 +822,6 @@ gst_ffmpegviddec_get_buffer2 (AVCodecContext * context, AVFrame * picture,
- 
-   picture->buf[0] = av_buffer_create (NULL, 0, dummy_free_buffer, dframe, 0);
- 
--  /* tell ffmpeg we own this buffer, transfer the ref we have on the buffer to
--   * the opaque data. */
--  picture->type = FF_BUFFER_TYPE_USER;
--
-   GST_LOG_OBJECT (ffmpegdec, "returned frame %p", dframe->buffer);
- 
-   return 0;
-@@ -1355,8 +1348,6 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
-       (guint64) ffmpegdec->picture->pts);
-   GST_DEBUG_OBJECT (ffmpegdec, "picture: num %d",
-       ffmpegdec->picture->coded_picture_number);
--  GST_DEBUG_OBJECT (ffmpegdec, "picture: ref %d",
--      ffmpegdec->picture->reference);
-   GST_DEBUG_OBJECT (ffmpegdec, "picture: display %d",
-       ffmpegdec->picture->display_picture_number);
-   GST_DEBUG_OBJECT (ffmpegdec, "picture: opaque %p",
-diff --git a/ext/libav/gstavviddec.h b/ext/libav/gstavviddec.h
-index f152ba8..a9965b7 100644
---- a/ext/libav/gstavviddec.h
-+++ b/ext/libav/gstavviddec.h
-@@ -41,7 +41,7 @@ struct _GstFFMpegVidDec
-   gboolean opened;
- 
-   /* current output pictures */
--  enum PixelFormat pic_pix_fmt;
-+  enum AVPixelFormat pic_pix_fmt;
-   gint pic_width;
-   gint pic_height;
-   gint pic_par_n;
-@@ -70,7 +70,7 @@ struct _GstFFMpegVidDec
-   GstBufferPool *internal_pool;
-   gint pool_width;
-   gint pool_height;
--  enum PixelFormat pool_format;
-+  enum AVPixelFormat pool_format;
-   GstVideoInfo pool_info;
- };
- 
-diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c
-index 1df1699..94aca49 100644
---- a/ext/libav/gstavvidenc.c
-+++ b/ext/libav/gstavvidenc.c
-@@ -290,7 +290,7 @@ gst_ffmpegvidenc_set_format (GstVideoEncoder * encoder,
-   GstCaps *allowed_caps;
-   GstCaps *icaps;
-   GstVideoCodecState *output_format;
--  enum PixelFormat pix_fmt;
-+  enum AVPixelFormat pix_fmt;
-   GstFFMpegVidEnc *ffmpegenc = (GstFFMpegVidEnc *) encoder;
-   GstFFMpegVidEncClass *oclass =
-       (GstFFMpegVidEncClass *) G_OBJECT_GET_CLASS (ffmpegenc);
-diff --git a/ext/libswscale/gstffmpegscale.c b/ext/libswscale/gstffmpegscale.c
-index f34259b..62343d0 100644
---- a/ext/libswscale/gstffmpegscale.c
-+++ b/ext/libswscale/gstffmpegscale.c
-@@ -45,7 +45,7 @@ typedef struct _GstFFMpegScale
-   /* state */
-   GstVideoInfo in_info, out_info;
- 
--  enum PixelFormat in_pixfmt, out_pixfmt;
-+  enum AVPixelFormat in_pixfmt, out_pixfmt;
-   struct SwsContext *ctx;
- 
-   /* property */
-@@ -214,8 +214,8 @@ gst_ffmpegscale_init (GstFFMpegScale * scale)
- {
-   scale->method = DEFAULT_PROP_METHOD;
-   scale->ctx = NULL;
--  scale->in_pixfmt = PIX_FMT_NONE;
--  scale->out_pixfmt = PIX_FMT_NONE;
-+  scale->in_pixfmt = AV_PIX_FMT_NONE;
-+  scale->out_pixfmt = AV_PIX_FMT_NONE;
- }
- 
- static void
-@@ -226,8 +226,8 @@ gst_ffmpegscale_reset (GstFFMpegScale * scale)
-     scale->ctx = NULL;
-   }
- 
--  scale->in_pixfmt = PIX_FMT_NONE;
--  scale->out_pixfmt = PIX_FMT_NONE;
-+  scale->in_pixfmt = AV_PIX_FMT_NONE;
-+  scale->out_pixfmt = AV_PIX_FMT_NONE;
- }
- 
- static void
-@@ -442,11 +442,11 @@ gst_ffmpegscale_get_unit_size (GstBaseTransform * trans, GstCaps * caps,
- 
- /* Convert a GstCaps (video/raw) to a FFMPEG PixFmt
-  */
--static enum PixelFormat
-+static enum AVPixelFormat
- gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps)
- {
-   GstVideoInfo info;
--  enum PixelFormat pix_fmt;
-+  enum AVPixelFormat pix_fmt;
- 
-   GST_DEBUG ("converting caps %" GST_PTR_FORMAT, caps);
- 
-@@ -455,52 +455,52 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps)
- 
-   switch (GST_VIDEO_INFO_FORMAT (&info)) {
-     case GST_VIDEO_FORMAT_YUY2:
--      pix_fmt = PIX_FMT_YUYV422;
-+      pix_fmt = AV_PIX_FMT_YUYV422;
-       break;
-     case GST_VIDEO_FORMAT_UYVY:
--      pix_fmt = PIX_FMT_UYVY422;
-+      pix_fmt = AV_PIX_FMT_UYVY422;
-       break;
-     case GST_VIDEO_FORMAT_I420:
--      pix_fmt = PIX_FMT_YUV420P;
-+      pix_fmt = AV_PIX_FMT_YUV420P;
-       break;
-     case GST_VIDEO_FORMAT_Y41B:
--      pix_fmt = PIX_FMT_YUV411P;
-+      pix_fmt = AV_PIX_FMT_YUV411P;
-       break;
-     case GST_VIDEO_FORMAT_Y42B:
--      pix_fmt = PIX_FMT_YUV422P;
-+      pix_fmt = AV_PIX_FMT_YUV422P;
-       break;
-     case GST_VIDEO_FORMAT_YUV9:
--      pix_fmt = PIX_FMT_YUV410P;
-+      pix_fmt = AV_PIX_FMT_YUV410P;
-       break;
-     case GST_VIDEO_FORMAT_ARGB:
--      pix_fmt = PIX_FMT_ARGB;
-+      pix_fmt = AV_PIX_FMT_ARGB;
-       break;
-     case GST_VIDEO_FORMAT_RGBA:
--      pix_fmt = PIX_FMT_RGBA;
-+      pix_fmt = AV_PIX_FMT_RGBA;
-       break;
-     case GST_VIDEO_FORMAT_BGRA:
--      pix_fmt = PIX_FMT_BGRA;
-+      pix_fmt = AV_PIX_FMT_BGRA;
-       break;
-     case GST_VIDEO_FORMAT_ABGR:
--      pix_fmt = PIX_FMT_ABGR;
-+      pix_fmt = AV_PIX_FMT_ABGR;
-       break;
-     case GST_VIDEO_FORMAT_BGR:
--      pix_fmt = PIX_FMT_BGR24;
-+      pix_fmt = AV_PIX_FMT_BGR24;
-       break;
-     case GST_VIDEO_FORMAT_RGB:
--      pix_fmt = PIX_FMT_RGB24;
-+      pix_fmt = AV_PIX_FMT_RGB24;
-       break;
-     case GST_VIDEO_FORMAT_RGB16:
--      pix_fmt = PIX_FMT_RGB565;
-+      pix_fmt = AV_PIX_FMT_RGB565;
-       break;
-     case GST_VIDEO_FORMAT_RGB15:
--      pix_fmt = PIX_FMT_RGB555;
-+      pix_fmt = AV_PIX_FMT_RGB555;
-       break;
-     case GST_VIDEO_FORMAT_RGB8P:
--      pix_fmt = PIX_FMT_PAL8;
-+      pix_fmt = AV_PIX_FMT_PAL8;
-       break;
-     default:
--      pix_fmt = PIX_FMT_NONE;
-+      pix_fmt = AV_PIX_FMT_NONE;
-       break;
-   }
-   return pix_fmt;
-@@ -508,7 +508,7 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps)
-   /* ERROR */
- invalid_caps:
-   {
--    return PIX_FMT_NONE;
-+    return AV_PIX_FMT_NONE;
-   }
- }
- 
-@@ -537,8 +537,8 @@ gst_ffmpegscale_set_caps (GstBaseTransform * trans, GstCaps * incaps,
-   scale->in_pixfmt = gst_ffmpeg_caps_to_pixfmt (incaps);
-   scale->out_pixfmt = gst_ffmpeg_caps_to_pixfmt (outcaps);
- 
--  if (!ok || scale->in_pixfmt == PIX_FMT_NONE ||
--      scale->out_pixfmt == PIX_FMT_NONE ||
-+  if (!ok || scale->in_pixfmt == AV_PIX_FMT_NONE ||
-+      scale->out_pixfmt == AV_PIX_FMT_NONE ||
-       GST_VIDEO_INFO_FORMAT (&scale->in_info) == GST_VIDEO_FORMAT_UNKNOWN ||
-       GST_VIDEO_INFO_FORMAT (&scale->out_info) == GST_VIDEO_FORMAT_UNKNOWN)
-     goto refuse_caps;
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild
deleted file mode 100644
index d9fb41eb01e0..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils flag-o-matic multilib-minimal
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="ia64 ppc"
-IUSE="libav +orc"
-
-RDEPEND="
-	>=media-libs/gstreamer-1.4.0:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-1.4.0:1.0[${MULTILIB_USEDEP}]
-	!libav? ( >=media-video/ffmpeg-2.2:0=[${MULTILIB_USEDEP}] )
-	libav? ( >=media-video/libav-9:0=[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=743984
-	epatch "${FILESDIR}/${PN}-1.4.5-libav9.patch"
-}
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# always use system ffmpeg/libav if possible
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		--with-system-libav \
-		$(use_enable orc)
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror
-	emake ERROR_CFLAGS=
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild
deleted file mode 100644
index f678f3c22456..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils flag-o-matic multilib-minimal
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="libav +orc"
-
-RDEPEND="
-	>=media-libs/gstreamer-1.4.0:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-1.4.0:1.0[${MULTILIB_USEDEP}]
-	!libav? ( >=media-video/ffmpeg-2.2:0=[${MULTILIB_USEDEP}] )
-	libav? ( >=media-video/libav-10:0=[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# Upstream patches
-	# avviddec: Error out if we try to allocate a buffer without being negotiated
-	epatch "${FILESDIR}"/${P}-allocate-buffer.patch
-
-	# avauddev: Unref decoded AVFrame after we're done with it
-	epatch "${FILESDIR}"/${P}-fix-memleak.patch
-
-	# avviddec: Post error message before returning a flow error
-	epatch "${FILESDIR}"/${P}-post-error.patch
-
-	# avviddec: Release stream lock while calling avcodec_decode_video2()
-	epatch "${FILESDIR}"/${P}-h265-fixes.patch
-}
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# always use system ffmpeg/libav if possible
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		--with-system-libav \
-		$(use_enable orc)
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror
-	emake ERROR_CFLAGS=
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild
deleted file mode 100644
index a55f64fdde95..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils multilib-minimal autotools
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="libav +orc"
-
-# XXX: bzip2/lzma are automagic
-RDEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}]
-	!libav? ( >=media-video/ffmpeg-2.8.5:0=[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-1.6.3-deinterlace-lavf.patch" \
-		"${FILESDIR}/${PN}-1.6.3-no-deprecated.patch" \
-		"${FILESDIR}/${PN}-1.6.3-bitrate.patch" \
-		"${FILESDIR}/${PN}-1.6.3-chain-dispose.patch" \
-		"${FILESDIR}/${PN}-1.6.3-minr-maxr.patch" \
-		"${FILESDIR}/${PN}-1.6.3-minr-compat.patch"
-	eautoreconf
-}
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# Upstream dropped support for system libav and won't work
-	# for preserving its compat anymore, forcing us to rely on internal
-	# ffmpeg copy if we don't want to cause unresolvable blockers for
-	# libav setups.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758183
-	# Prefer system ffmpeg for -libav
-	local myconf
-
-	if use libav; then
-		ewarn "Using internal ffmpeg copy as upstream dropped the"
-		ewarn "the support for compiling against system libav"
-		ewarn "http://bugzilla.gnome.org/show_bug.cgi?id=758183"
-	else
-		myconf="--with-system-libav"
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		$(use_enable orc) \
-		${myconf}
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror
-	emake ERROR_CFLAGS=
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.2.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.2.ebuild
deleted file mode 100644
index 546a3b8a80fe..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils multilib-minimal
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="libav +orc"
-
-# XXX: bzip2/lzma are automagic
-RDEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}]
-	!libav? ( >=media-video/ffmpeg-2.8.5:0=[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# Upstream dropped support for system libav and won't work
-	# for preserving its compat anymore, forcing us to rely on internal
-	# ffmpeg copy if we don't want to cause unresolvable blockers for
-	# libav setups.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758183
-	# Prefer system ffmpeg for -libav
-	local myconf
-
-	if use libav; then
-		ewarn "Using internal ffmpeg copy as upstream dropped the"
-		ewarn "the support for compiling against system libav"
-		ewarn "http://bugzilla.gnome.org/show_bug.cgi?id=758183"
-	else
-		myconf="--with-system-libav"
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		$(use_enable orc) \
-		${myconf}
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror
-	emake ERROR_CFLAGS=
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}