[oe-commits] Felix Domke : gst-plugins-bad: fix git merge breakage

[git version control]

Module: openembedded.git
Branch: org.openembedded.dreambox
Commit: 2992f11abf66df379dde5fa793c0d36fc7fb1310
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2992f11abf66df379dde5fa793c0d36fc7fb1310

Author: Felix Domke <felix.domke at multimedia-labs.de>
Date:   Thu Sep 10 18:11:57 2009 +0200

gst-plugins-bad: fix git merge breakage

---

 packages/gstreamer/gst-plugins-bad_0.10.14.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/packages/gstreamer/gst-plugins-bad_0.10.14.bb b/packages/gstreamer/gst-plugins-bad_0.10.14.bb
index ee16201..6f3e8e1 100644
--- a/packages/gstreamer/gst-plugins-bad_0.10.14.bb
+++ b/packages/gstreamer/gst-plugins-bad_0.10.14.bb
@@ -3,5 +3,6 @@ DEPENDS += "gst-plugins-base"
 EXTRA_OECONF += "--disable-apexsink --disable-dvdnav"
 RCONFLICTS_gst-plugin-mpegdemux = "gst-plugin-fluendo-mpegdemux"
 RREPLACES_gst-plugin-mpegdemux = "gst-plugin-fluendo-mpegdemux"
-SRC_URI += "file://gst-plugins_configure_skip_shave.patch;patch=1;pnum=0"
+SRC_URI += "file://gst-plugins_configure_skip_shave.patch;patch=1;pnum=0 \
+	file://mpegpsdemux_speedup.diff;patch=1;pnum=0"
 PR = "r0"