summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorDmitrij D. Czarkoff <czarkoff@gmail.com>2016-01-11 19:03:40 +0100
committerwm4 <wm4@nowhere>2016-01-11 21:05:55 +0100
commitea442fa047819ec2e48a3dbe8ea21959ac3d70b0 (patch)
tree7eee2d4734a8bc8de35a9e6dd74d75051df64380 /audio
parent0915a8497b12a7b526e0e8eae322eb8deb31eace (diff)
downloadmpv-ea442fa047819ec2e48a3dbe8ea21959ac3d70b0.tar.bz2
mpv-ea442fa047819ec2e48a3dbe8ea21959ac3d70b0.tar.xz
mpv_talloc.h: rename from talloc.h
This change helps avoiding conflict with talloc.h from libtalloc.
Diffstat (limited to 'audio')
-rw-r--r--audio/audio.c2
-rw-r--r--audio/decode/ad_lavc.c2
-rw-r--r--audio/mixer.c2
-rw-r--r--audio/out/ao.c2
-rw-r--r--audio/out/ao_coreaudio_properties.c2
-rw-r--r--audio/out/ao_lavc.c2
-rw-r--r--audio/out/ao_null.c2
-rw-r--r--audio/out/ao_pcm.c2
-rw-r--r--audio/out/ao_rsound.c2
-rw-r--r--audio/out/ao_sdl.c2
10 files changed, 10 insertions, 10 deletions
diff --git a/audio/audio.c b/audio/audio.c
index c4ad4021b5..157649c3f8 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -24,7 +24,7 @@
#include <libavutil/frame.h>
#include <libavutil/version.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/common.h"
#include "fmt-conversion.h"
#include "audio.h"
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index 3188834830..f4a0a243d1 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -26,7 +26,7 @@
#include <libavutil/common.h>
#include <libavutil/intreadwrite.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "config.h"
#include "common/av_common.h"
diff --git a/audio/mixer.c b/audio/mixer.c
index deeea1b3e5..5f147872ab 100644
--- a/audio/mixer.c
+++ b/audio/mixer.c
@@ -27,7 +27,7 @@
#include "audio/filter/af.h"
#include "common/global.h"
#include "common/msg.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "mixer.h"
struct mixer {
diff --git a/audio/out/ao.c b/audio/out/ao.c
index c950b9e773..ffcc43ab79 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -20,7 +20,7 @@
#include <string.h>
#include <assert.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "config.h"
#include "ao.h"
diff --git a/audio/out/ao_coreaudio_properties.c b/audio/out/ao_coreaudio_properties.c
index cf2b4d14a1..b74cf07289 100644
--- a/audio/out/ao_coreaudio_properties.c
+++ b/audio/out/ao_coreaudio_properties.c
@@ -21,7 +21,7 @@
#include "audio/out/ao_coreaudio_properties.h"
#include "audio/out/ao_coreaudio_utils.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
OSStatus ca_get(AudioObjectID id, ca_scope scope, ca_sel selector,
uint32_t size, void *data)
diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c
index 332350fd17..b671301922 100644
--- a/audio/out/ao_lavc.c
+++ b/audio/out/ao_lavc.c
@@ -31,7 +31,7 @@
#include "common/common.h"
#include "audio/format.h"
#include "audio/fmt-conversion.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "ao.h"
#include "internal.h"
#include "common/msg.h"
diff --git a/audio/out/ao_null.c b/audio/out/ao_null.c
index 0af0a97b96..7d45795d9e 100644
--- a/audio/out/ao_null.c
+++ b/audio/out/ao_null.c
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <math.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "config.h"
#include "osdep/timer.h"
diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c
index 76f0315bef..c26f614f2d 100644
--- a/audio/out/ao_pcm.c
+++ b/audio/out/ao_pcm.c
@@ -27,7 +27,7 @@
#include <libavutil/common.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "options/m_option.h"
#include "audio/format.h"
diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c
index 0385b09cb8..5379e73a72 100644
--- a/audio/out/ao_rsound.c
+++ b/audio/out/ao_rsound.c
@@ -26,7 +26,7 @@
#include <unistd.h>
#include <rsound.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "options/m_option.h"
#include "osdep/timer.h"
diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c
index bf65a4a4d8..5e5bd25b96 100644
--- a/audio/out/ao_sdl.c
+++ b/audio/out/ao_sdl.c
@@ -20,7 +20,7 @@
#include "config.h"
#include "audio/format.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "ao.h"
#include "internal.h"
#include "common/common.h"