FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages 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
{ {