projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db99957 efdd325)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 10 Jun 2011 10:14:57 +0000 (12:14 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 10 Jun 2011 10:14:57 +0000 (12:14 +0200)
Conflicts:
tests/examples/audio/Makefile.am
tests/examples/v4l/Makefile.am

1  2 
ext/pango/Makefile.am patch | diff1 | diff2 | blob | history
gst-libs/gst/tag/gstvorbistag.c patch | diff1 | diff2 | blob | history
gst-libs/gst/tag/gstxmptag.c patch | diff1 | diff2 | blob | history
gst-libs/gst/tag/tag.h patch | diff1 | diff2 | blob | history
tests/examples/audio/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc ext/pango/Makefile.am
Simple merge
diff --cc gst-libs/gst/tag/gstvorbistag.c
Simple merge
diff --cc gst-libs/gst/tag/gstxmptag.c
Simple merge
diff --cc gst-libs/gst/tag/tag.h
Simple merge
diff --cc tests/examples/audio/Makefile.am
index d6a975d,e0cc5ef..49d7266
--- 1/tests/examples/audio/Makefile.am
--- 2/tests/examples/audio/Makefile.am
+++ b/tests/examples/audio/Makefile.am
@@@ -2,6 -2,6 +2,5 @@@
  noinst_PROGRAMS = testchannels
  testchannels_SOURCES = testchannels.c
  testchannels_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
- testchannels_LDADD = $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
-       $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS)
- 
+ testchannels_LDADD = $(top_builddir)/gst-libs/gst/audio/libgstaudio-$(GST_MAJORMINOR).la \
+                      $(GST_LIBS)
 -
Domain: Multimedia / Media Common;