From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Fri, 15 Jul 2011 15:06:39 +0000 (+0200)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: 1.19.3~509^2~7742
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c087d7d85a8410675023d760abc2676077f6543;p=platform%2Fupstream%2Fgstreamer.git

Merge branch 'master' into 0.11
---

9c087d7d85a8410675023d760abc2676077f6543
diff --cc gst/rtp/Makefile.am
index 3064a5e,5c43cce..bfdc5d8
--- a/gst/rtp/Makefile.am
+++ b/gst/rtp/Makefile.am
@@@ -83,9 -84,9 +83,10 @@@ endi
  libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
  libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
  		-lgstaudio-@GST_MAJORMINOR@ \
 +		-lgstvideo-@GST_MAJORMINOR@ \
                  -lgsttag-@GST_MAJORMINOR@ \
                  -lgstrtp-@GST_MAJORMINOR@ \
+                 -lgstpbutils-@GST_MAJORMINOR@ \
  		$(GST_BASE_LIBS) $(GST_LIBS) \
  		$(WINSOCK2_LIBS) $(LIBM)
  libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)