mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 13:06:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

osxaudio: Fix merge conflicts

Browse source
This commit is contained in:
Sebastian Dröge 2013-04-17 20:24:48 +02:00
parent 12601adbf0
commit 27248393e4
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/osxaudio/gstosxcoreaudiocommon.h
View file

@ -22,11 +22,7 @@
*/ */
#include "gstosxcoreaudio.h" #include "gstosxcoreaudio.h"
<<<<<<<
#include <gst/audio/multichannel.h>
=======
#include <gst/audio/audio-channels.h> #include <gst/audio/audio-channels.h>
>>>>>>>
typedef struct typedef struct
{ {