Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 15 Jul 2011 15:06:39 +0000 (17:06 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 15 Jul 2011 15:06:39 +0000 (17:06 +0200)
1  2 
gst/audioparsers/gstac3parse.c
gst/rtp/Makefile.am
gst/rtp/gstrtph264pay.c
gst/rtp/gstrtppcmadepay.c
gst/rtp/gstrtppcmapay.c
gst/rtp/gstrtppcmudepay.c
gst/rtp/gstrtppcmupay.c
gst/rtsp/gstrtspsrc.c

Simple merge
@@@ -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) 
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge