projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 12601ad)
osxaudio: Fix merge conflicts
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 17 Apr 2013 18:24:48 +0000 (20:24 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 17 Apr 2013 18:24:48 +0000 (20:24 +0200)
sys/osxaudio/gstosxcoreaudiocommon.h patch | blob | history

diff --git a/sys/osxaudio/gstosxcoreaudiocommon.h b/sys/osxaudio/gstosxcoreaudiocommon.h
index c079e5096c0c36af8f6f4630ab143b7614fe34a4..e9fbb8e7fd146a1d6ddd949ef60c8bd2fc9091ed 100644 (file)
--- a/sys/osxaudio/gstosxcoreaudiocommon.h
+++ b/sys/osxaudio/gstosxcoreaudiocommon.h
@@ -22,11 +22,7 @@
  */
 
 #include "gstosxcoreaudio.h"
-<<<<<<<
-#include <gst/audio/multichannel.h>
-=======
 #include <gst/audio/audio-channels.h>
->>>>>>>
 
 typedef struct
 {
Domain: Multimedia / Media Common;