summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2008-12-12 12:05:29 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2008-12-12 12:05:29 +0000
commit89cba614f3a440c125097337b89230b28ea1ccec (patch)
treebafd219a8648f66841bade291386088c1db9645f /media-plugins/gst-plugins-ffmpeg
parentRemoving nemesi and fenice, masked since 05 Jan 2008 for security issues. The... (diff)
downloadgentoo-2-89cba614f3a440c125097337b89230b28ea1ccec.tar.gz
gentoo-2-89cba614f3a440c125097337b89230b28ea1ccec.tar.bz2
gentoo-2-89cba614f3a440c125097337b89230b28ea1ccec.zip
old
(Portage version: 2.1.6/cvs/Linux 2.6.27.7 i686)
Diffstat (limited to 'media-plugins/gst-plugins-ffmpeg')
-rw-r--r--media-plugins/gst-plugins-ffmpeg/Manifest9
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/0.10.4/01_new-codec-ids.patch12
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/0.10.4/02_av_picture_copy.patch97
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/0.10.4/03_disable-aac.patch13
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/0.10.4/04_disable-mpegts.patch33
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/0.10.4/system-ffmpeg-warning.patch71
-rw-r--r--media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.3.ebuild49
-rw-r--r--media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.4-r1.ebuild71
8 files changed, 0 insertions, 355 deletions
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index a376c99325af..b84c99184446 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -1,22 +1,13 @@
-AUX 0.10.4/01_new-codec-ids.patch 480 RMD160 6d104574a160609adbc4ebc709710a08421a5358 SHA1 3f98f84d4af9a75ddec1500a7a1b244ffec4d518 SHA256 342a62e3974af1b37f088b176aab2d784d8f803bb0c12864ee61082bd7da3252
-AUX 0.10.4/02_av_picture_copy.patch 4524 RMD160 38e0b4d994c1aea01073d61e363d2fa6d9830a12 SHA1 dbf0be37aeb7c8e7e592bdc81df70a5fab2a4831 SHA256 63c67fdd9a22cd69050bfa29b85e7c51c77a211967a18db57c9c60f99a07594f
-AUX 0.10.4/03_disable-aac.patch 578 RMD160 008bfffd264a0d7548f5ee311608970fbfa43db3 SHA1 134444d6c95bd18e240b2cf9ae41acce53f809cd SHA256 9c863f17c037efb9ac2093a743a080503863c7ed414e334816f842cf3010a0cc
-AUX 0.10.4/04_disable-mpegts.patch 1578 RMD160 42bbaf4583503cdfc989281eddcbb3b79bf7b898 SHA1 d8f97ac2e0d605847a422f266aa0d01a9076fd96 SHA256 e5e47a154cc60ef4379627ec0a4c42deafeab490106962ff735fbdfbe98ac057
-AUX 0.10.4/system-ffmpeg-warning.patch 3438 RMD160 1b71038b113e67d08b574b8a5ccd3e973996496d SHA1 643519922214d1cc375a9309d2c400e5b9f05048 SHA256 8b06b08ffda983965b8dcc61f5ddadf418b8ffee6daccd38d82b5cd80e1ede45
AUX 0.10.5/lavc.patch 8765 RMD160 fd4d4d6c0d9cea1202f511a071a8ebf4bb7bb80c SHA1 ba3b67eee7754122ca6adc49d899ad922355bd33 SHA256 aef53bcf9fcac97662df70858ea5a2e02c4661f695b5d0425d0ca6f4a53342ad
AUX 0.10.5/offset.patch 525 RMD160 bc69512dbd8cbf979bbcf88f07bb11ddc356ab04 SHA1 761f0c4fa50fb942b94996c52789b40558188ace SHA256 dd5ccdb6cc16d72f7dd94e89f549c32fe09a483b503369fa06e3b673d89d6d33
AUX 0.10.5/system-ffmpeg-warning.patch 3567 RMD160 a86a0b85d1b7972898ca775218fbab1e1897cbeb SHA1 5a06df62273146890585fc457f5bda9c2c77b13e SHA256 73c9cfa1006c6bca43d677a60ca8b2e30bca3b17c9855d11812afffa35542568
AUX 0.10.6/system-ffmpeg-warning.patch 3547 RMD160 260b776fea9854c235bb3a4dc155b0d9cd8ef649 SHA1 fa938e48f5420194b929e8025fb98144471f3450 SHA256 fccf0f672fc34fd03d156ba4d9498511858563ea2e9fbe3c217adc6a4f9abd6c
DIST gst-ffmpeg-0.10.1.tar.bz2 2246682 RMD160 8106a431926c14411ce252f440ec6d1fbdd127d9 SHA1 a3bafaf83db1aadc14abc94c7d89cd7d2f739f0a SHA256 a2c877c38d057875c7dfbf1803030c5cc9707020b77f91673500d6ea8d858607
DIST gst-ffmpeg-0.10.2.tar.bz2 2515373 RMD160 844552e90da1b9b156042151722ec1b7a1c002ea SHA1 95ca222351a543c9a1f45e89e0695a3b709ec2f6 SHA256 ffa7c89bccab5d1be53b6fcedcf7a5c071d585cf522fee5864add05d350f5842
-DIST gst-ffmpeg-0.10.3.tar.bz2 2529034 RMD160 0a56e2c896fb14d000c734c75bd5f64a35a2efc3 SHA1 dd40cc38f7581412e5e23d2bf401cc66c9ba1f55 SHA256 b85899ac1c792db2e12d7063c45c0c6638dc8cc234d3ac6786b739cc6486439f
-DIST gst-ffmpeg-0.10.4.tar.bz2 3011048 RMD160 efcea2a3953c147eabd2aaa7ff5a3656e1071ab9 SHA1 41977e74aed48154df2d831c652eef1bd42caf19 SHA256 840015b4e0f0e7248b178eafc37476d6eb9aea3876eb3b07e2a66b430b526da2
DIST gst-ffmpeg-0.10.5.tar.bz2 3031714 RMD160 ae314047c7a5feacc78dff4392f5e9989f88aac6 SHA1 795540b2277af922fd868b1ee62445274150f5ee SHA256 3316bf75739cbb36c9cd85b13026d09675fca349f29e9fdd29aa51712520c28b
DIST gst-ffmpeg-0.10.6.tar.bz2 3126310 RMD160 537ed2f6ce6463a6cc6d913c246afe130435309a SHA1 0979f167bbe440f1948060737c8d50a1400276b6 SHA256 c9a5f4c9b1eddd7cb042d83390072f832f19f3712d023e4d6568391e5eb4878a
EBUILD gst-plugins-ffmpeg-0.10.1-r1.ebuild 1356 RMD160 e22b14cde21d4e69929205316d44ca10dce838a5 SHA1 64049ec884f036ea04367657367271e7682ab43f SHA256 baed3556c3628b5c209549af8489bb235dac2b355e92ad7a2f9d77e7dd8ceb99
EBUILD gst-plugins-ffmpeg-0.10.2.ebuild 1395 RMD160 aa185e9e2bf0c22b46b821275f8cac8710fc73f4 SHA1 379825085337ac83d2d3b980d55bfb81cc805b81 SHA256 9d73dc90af87057b0eff9470fe0c19c7e8339d3213d673e9aae2294d40b23b62
-EBUILD gst-plugins-ffmpeg-0.10.3.ebuild 1429 RMD160 81608e0491265454d913a219163e8b8e90504a9a SHA1 bab3afa6bf58d1cc1c3a4ea28c99c35874690007 SHA256 84701d6c49f483e2dca32520ed17704766a508f91447680d71a32846fc89053c
-EBUILD gst-plugins-ffmpeg-0.10.4-r1.ebuild 2076 RMD160 6b67cc1134653a666542840f87b9c178cb8e5a93 SHA1 4e1c74e102db195a91c04ca6ac9f2ade6735f944 SHA256 e511ab68e566a6608a24565a972f9bec5b47ba4ccf4aa72a7865986926ad72fc
EBUILD gst-plugins-ffmpeg-0.10.5.ebuild 1654 RMD160 fd9d2673bb506bba2a563ac6b7f2d05bf9ef9cac SHA1 f14d2652172bdef22ff8123bb5138fd8752ab085 SHA256 e06e8aac6c768306ccee972610813201d54691b090a3b48f90da88a51b5ae44c
EBUILD gst-plugins-ffmpeg-0.10.6.ebuild 1551 RMD160 27d943b8f95ecd70400e584b48e1971d0a00a47c SHA1 1aca996f3cadacca8ce4902099b61a59c6b0ff65 SHA256 cb5a911bb71c2589e7f8444678e5dd14628dcff6022126dbcec4d3a7ca7dffd1
MISC ChangeLog 14179 RMD160 af38d473af49f57a4620445d810e3aaa87c3fade SHA1 1f4cc6b620cda0ae0b769f857ff61ca9898ee4b5 SHA256 744c2585d2dc6166f3fd91a82dc22265c71c07706be056d1625fcd00041d3931
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.4/01_new-codec-ids.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.4/01_new-codec-ids.patch
deleted file mode 100644
index ee7d45b5cb8c..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/0.10.4/01_new-codec-ids.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ext/ffmpeg/gstffmpegcodecmap.c.old 2008-05-12 17:24:59.000000000 +0200
-+++ ext/ffmpeg/gstffmpegcodecmap.c 2008-05-12 17:26:20.000000000 +0200
-@@ -1051,6 +1051,9 @@
- "samplesize", G_TYPE_INT, context->bits_per_sample, NULL);
- }
- break;
-+ case CODEC_ID_VORBIS:
-+ caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-vorbis", NULL);
-+ break;
- default:
- g_warning ("Unknown codec ID %d, please add here", codec_id);
- break;
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.4/02_av_picture_copy.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.4/02_av_picture_copy.patch
deleted file mode 100644
index 2028eed2cb9e..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/0.10.4/02_av_picture_copy.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -up gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.c~ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.c
---- gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.c~ 2008-05-22 20:18:14.000000000 +0200
-+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.c 2008-05-22 20:18:14.000000000 +0200
-@@ -3287,29 +3287,3 @@ gst_ffmpeg_avpicture_fill (AVPicture * p
-
- return 0;
- }
--
--/**
-- * Convert image 'src' to 'dst'.
-- *
-- * We use this code to copy two pictures between the same
-- * colorspaces, so this function is not realy used to do
-- * colorspace conversion.
-- * The ffmpeg code has a bug in it where odd sized frames were
-- * not copied completely. We adjust the input parameters for
-- * the original ffmpeg img_convert function here so that it
-- * still does the right thing.
-- */
--int
--gst_ffmpeg_img_convert (AVPicture * dst, int dst_pix_fmt,
-- const AVPicture * src, int src_pix_fmt, int src_width, int src_height)
--{
-- struct SwsContext *ctx;
-- int res;
--
-- ctx = sws_getContext (src_width, src_height, src_pix_fmt, src_width, src_height, dst_pix_fmt, 2, /* flags : bicubic */
-- NULL, NULL, NULL);
-- res = sws_scale (ctx, (uint8_t **) src->data, (int *) src->linesize,
-- 2, src_width, dst->data, dst->linesize);
-- sws_freeContext (ctx);
-- return res;
--}
-diff -up gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.h~ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.h
---- gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.h~ 2008-05-22 20:17:56.000000000 +0200
-+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.h 2008-05-22 20:17:56.000000000 +0200
-@@ -125,15 +125,6 @@ gst_ffmpeg_avpicture_fill (AVPicture * p
- int height);
-
- /*
-- * convert an image, we only use this for copying the image, ie,
-- * convert between the same colorspaces.
-- */
--int
--gst_ffmpeg_img_convert (AVPicture * dst, int dst_pix_fmt,
-- const AVPicture * src, int src_pix_fmt,
-- int src_width, int src_height);
--
--/*
- * Convert from/to a GStreamer <-> FFMpeg timestamp.
- */
- static inline guint64
-diff -up gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c~ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c
---- gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c~ 2008-05-22 20:27:02.000000000 +0200
-+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c 2008-05-22 20:27:02.000000000 +0200
-@@ -1342,11 +1342,7 @@ get_output_buffer (GstFFMpegDec * ffmpeg
- gst_ffmpeg_avpicture_fill (&pic, GST_BUFFER_DATA (*outbuf),
- ffmpegdec->context->pix_fmt, width, height);
-
-- /* the original convert function did not do the right thing, this
-- * is a patched up version that adjust widht/height so that the
-- * ffmpeg one works correctly. */
-- gst_ffmpeg_img_convert (&pic, ffmpegdec->context->pix_fmt,
-- (AVPicture *) ffmpegdec->picture,
-+ av_picture_copy(&pic, (AVPicture *) ffmpegdec->picture,
- ffmpegdec->context->pix_fmt, width, height);
- }
- ffmpegdec->picture->pts = -1;
-diff -up gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdemux.c~ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdemux.c
---- gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdemux.c~ 2008-05-22 20:27:18.000000000 +0200
-+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdemux.c 2008-05-22 20:27:18.000000000 +0200
-@@ -1268,9 +1268,8 @@ gst_ffmpegdemux_loop (GstPad * pad)
- avstream->codec->pix_fmt, avstream->codec->width,
- avstream->codec->height);
-
-- gst_ffmpeg_img_convert (&dst, avstream->codec->pix_fmt,
-- &src, avstream->codec->pix_fmt, avstream->codec->width,
-- avstream->codec->height);
-+ av_picture_copy (&dst, &src, avstream->codec->pix_fmt,
-+ avstream->codec->width, avstream->codec->height);
- } else {
- memcpy (GST_BUFFER_DATA (outbuf), pkt.data, outsize);
- }
-diff -up gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegmux.c~ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegmux.c
---- gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegmux.c~ 2008-05-22 20:27:17.000000000 +0200
-+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegmux.c 2008-05-22 20:27:17.000000000 +0200
-@@ -554,8 +554,8 @@ gst_ffmpegmux_collected (GstCollectPads
- gst_ffmpeg_avpicture_fill (&src, GST_BUFFER_DATA (buf),
- PIX_FMT_RGB24, st->codec->width, st->codec->height);
-
-- gst_ffmpeg_img_convert (&dst, PIX_FMT_RGB24,
-- &src, PIX_FMT_RGB24, st->codec->width, st->codec->height);
-+ av_picture_copy(&dst, &src, PIX_FMT_RGB24,
-+ st->codec->width, st->codec->height);
- } else {
- pkt.data = GST_BUFFER_DATA (buf);
- pkt.size = GST_BUFFER_SIZE (buf);
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.4/03_disable-aac.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.4/03_disable-aac.patch
deleted file mode 100644
index 8b71092998c9..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/0.10.4/03_disable-aac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ext/ffmpeg/gstffmpegdec.c.old 2008-05-23 11:45:42.000000000 +0200
-+++ ext/ffmpeg/gstffmpegdec.c 2008-05-23 11:48:52.000000000 +0200
-@@ -2456,7 +2456,9 @@
- !strcmp (in_plugin->name, "vorbis") ||
- !strcmp (in_plugin->name, "mpeg1video") ||
- !strcmp (in_plugin->name, "wavpack") ||
-- !strcmp (in_plugin->name, "mp2")) {
-+ !strcmp (in_plugin->name, "mp2") ||
-+ !strcmp (in_plugin->name, "libfaad") ||
-+ !strcmp (in_plugin->name, "mpeg4aac")) {
- GST_LOG ("Ignoring decoder %s", in_plugin->name);
- goto next;
- }
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.4/04_disable-mpegts.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.4/04_disable-mpegts.patch
deleted file mode 100644
index ac8eaf14c300..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/0.10.4/04_disable-mpegts.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: gstffmpegdemux.c
-===================================================================
-RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdemux.c,v
-retrieving revision 1.90
-diff -u -p -r1.90 gstffmpegdemux.c
---- ext/ffmpeg/gstffmpegdemux.c 13 May 2008 15:07:25 -0000 1.90
-+++ ext/ffmpeg/gstffmpegdemux.c 18 May 2008 14:33:02 -0000
-@@ -1142,10 +1142,14 @@ gst_ffmpegdemux_type_find (GstTypeFind *
- res = MAX (1, res * GST_TYPE_FIND_MAXIMUM / AVPROBE_SCORE_MAX);
- /* Restrict the probability for MPEG-TS streams, because there is
- * probably a better version in plugins-base, if the user has a recent
-- * plugins-base */
-- if (!strcmp (in_plugin->name, "mpegts"))
-+ * plugins-base (in fact we shouldn't even get here for ffmpeg mpegts or
-+ * mpegtsraw typefinders, since we blacklist them) */
-+ if (g_str_has_prefix (in_plugin->name, "mpegts"))
- res = MIN (res, GST_TYPE_FIND_POSSIBLE);
-
-+ GST_LOG ("ffmpeg typefinder '%s' suggests %" GST_PTR_FORMAT ", p=%u%%",
-+ in_plugin->name, params->sinkcaps, res);
-+
- gst_type_find_suggest (tf, res, params->sinkcaps);
- }
- }
-@@ -1552,6 +1556,7 @@ gst_ffmpegdemux_register (GstPlugin * pl
- !strcmp (in_plugin->name, "mpc") ||
- !strcmp (in_plugin->name, "mpc8") ||
- !strcmp (in_plugin->name, "mpegts") ||
-+ !strcmp (in_plugin->name, "mpegtsraw") ||
- !strcmp (in_plugin->name, "nuv") ||
- !strcmp (in_plugin->name, "swf") ||
- !strcmp (in_plugin->name, "voc") || !strcmp (in_plugin->name, "gif"))
-
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.4/system-ffmpeg-warning.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.4/system-ffmpeg-warning.patch
deleted file mode 100644
index 0a0ec05811fb..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/0.10.4/system-ffmpeg-warning.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- configure.old 2008-06-25 22:04:10.000000000 +0200
-+++ configure 2008-06-25 22:04:44.000000000 +0200
-@@ -25559,68 +25559,11 @@
- _ACEOF
-
- HAVE_FFMPEG_UNINSTALLED=0
- { echo "$as_me:$LINENO: Using system-installed FFMpeg code" >&5
- echo "$as_me: Using system-installed FFMpeg code" >&6;}
-- { echo "$as_me:$LINENO: WARNING:
-- ======================================================================
-- WARNING: you have chosen to build gst-ffmpeg against a random
-- external version of ffmpeg instead of building it against the tested
-- internal ffmpeg snapshot that is included with gst-ffmpeg.
--
-- This is a very bad idea. So bad in fact that words cannot express
-- just how bad it is. Suffice to say that it is BAD.
--
-- The GStreamer developers cannot and will not support a gst-ffmpeg
-- built this way. Any bug reports that indicate there is an external
-- version of ffmpeg involved will be closed immediately without further
-- investigation.
--
-- The reason such a setup can't be supported is that the ffmpeg API
-- and ABI is in constant flux, yet there aren't any official releases
-- of the ffmpeg library to develop against. This makes it impossible
-- to guarantee that gst-ffmpeg will work reliably, or even compile,
-- with a randomly picked version ffmpeg. Even if gst-ffmpeg compiles
-- and superficially appears to work fine against your chosen external
-- ffmpeg version, that might just not be the case on other systems, or
-- even the same system at a later time, or when using decoders,
-- encoders, demuxers or muxers that have not been tested.
--
-- Please do not create or distribute binary packages of gst-ffmpeg
-- that link against an external ffmpeg. Thank you!
-- ======================================================================
-- " >&5
--echo "$as_me: WARNING:
-- ======================================================================
-- WARNING: you have chosen to build gst-ffmpeg against a random
-- external version of ffmpeg instead of building it against the tested
-- internal ffmpeg snapshot that is included with gst-ffmpeg.
--
-- This is a very bad idea. So bad in fact that words cannot express
-- just how bad it is. Suffice to say that it is BAD.
--
-- The GStreamer developers cannot and will not support a gst-ffmpeg
-- built this way. Any bug reports that indicate there is an external
-- version of ffmpeg involved will be closed immediately without further
-- investigation.
--
-- The reason such a setup can't be supported is that the ffmpeg API
-- and ABI is in constant flux, yet there aren't any official releases
-- of the ffmpeg library to develop against. This makes it impossible
-- to guarantee that gst-ffmpeg will work reliably, or even compile,
-- with a randomly picked version ffmpeg. Even if gst-ffmpeg compiles
-- and superficially appears to work fine against your chosen external
-- ffmpeg version, that might just not be the case on other systems, or
-- even the same system at a later time, or when using decoders,
-- encoders, demuxers or muxers that have not been tested.
--
-- Please do not create or distribute binary packages of gst-ffmpeg
-- that link against an external ffmpeg. Thank you!
-- ======================================================================
-- " >&2;}
-
-- sleep 15
- else
-
- source "$srcdir/ffmpegrev"
-
- { echo "$as_me:$LINENO: Using ffmpeg revision $FFMPEG_REVISION" >&5
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.3.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.3.ebuild
deleted file mode 100644
index 337fb51580a9..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.3.ebuild,v 1.2 2008/02/22 10:41:38 zaheerm Exp $
-
-inherit flag-o-matic eutils
-
-MY_PN=${PN/-plugins/}
-MY_P=${MY_PN}-${PV}
-
-# Create a major/minor combo for SLOT
-PVP=(${PV//[-\._]/ })
-SLOT=${PVP[0]}.${PVP[1]}
-#SLOT=0.10
-
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
-SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=media-libs/gstreamer-0.10.4
- >=media-libs/gst-plugins-base-0.10.4
- >=dev-libs/liboil-0.3.6"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-src_compile() {
- # Restrictions taken from the mplayer ebuild
- # See bug #64262 for more info
- # let's play the filtration game!
- filter-flags -fPIE -fPIC -fstack-protector -fforce-addr -momit-leaf-frame-pointer -msse2 -msse3 -falign-functions -fweb
- # ugly optimizations cause MPlayer to cry on x86 systems!
- if use x86 ; then
- replace-flags -O0 -O2
- replace-flags -O3 -O2
- fi
-
- econf --disable-ffplay
- emake || die "emake failed."
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.4-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.4-r1.ebuild
deleted file mode 100644
index 61f82e212cd4..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.4-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.4-r1.ebuild,v 1.3 2008/10/14 16:37:41 loki_val Exp $
-
-inherit flag-o-matic eutils base
-
-PD=${FILESDIR}/${PV}
-MY_PN=${PN/-plugins}
-MY_P=${MY_PN}-${PV}
-
-# Create a major/minor combo for SLOT
-PVP=(${PV//[-\._]/ })
-SLOT=${PVP[0]}.${PVP[1]}
-#SLOT=0.10
-
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
-SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=media-libs/gstreamer-0.10.4
- >=media-libs/gst-plugins-base-0.10.4
- >=dev-libs/liboil-0.3.6
- ~media-video/ffmpeg-0.4.9_p20080326"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-PATCHES=( "${PD}/01_new-codec-ids.patch"
- "${PD}/02_av_picture_copy.patch"
- "${PD}/03_disable-aac.patch"
- "${PD}/04_disable-mpegts.patch"
- "${PD}/system-ffmpeg-warning.patch" )
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- base_src_unpack autopatch
- sed -i \
- -e 's,ffmpeg/avformat.h,libavformat/avformat.h,' \
- -e 's,ffmpeg/avcodec.h,libavcodec/avcodec.h,' \
- -e 's,ffmpeg/swscale.h,libswscale/swscale.h,' \
- -e 's,postproc/postprocess.h,libpostproc/postprocess.h,' \
- ext/ffmpeg/gst* \
- ext/libpostproc/gstpostproc.c \
- || die "404. No files found."
-}
-
-src_compile() {
- # Restrictions taken from the mplayer ebuild
- # See bug #64262 for more info
- # let's play the filtration game!
- filter-flags -fPIE -fPIC -fstack-protector -fforce-addr -momit-leaf-frame-pointer -msse2 -msse3 -falign-functions -fweb
- # ugly optimizations cause MPlayer to cry on x86 systems!
- if use x86 ; then
- replace-flags -O0 -O2
- replace-flags -O3 -O2
- fi
-
- econf --with-system-ffmpeg
- emake || die "emake failed."
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- dodoc AUTHORS ChangeLog NEWS README TODO
-}