diff options
author | Dmitrij D. Czarkoff <czarkoff@gmail.com> | 2016-01-11 19:03:40 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-01-11 21:05:55 +0100 |
commit | ea442fa047819ec2e48a3dbe8ea21959ac3d70b0 (patch) | |
tree | 7eee2d4734a8bc8de35a9e6dd74d75051df64380 /stream | |
parent | 0915a8497b12a7b526e0e8eae322eb8deb31eace (diff) | |
download | mpv-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 'stream')
-rw-r--r-- | stream/rar.c | 2 | ||||
-rw-r--r-- | stream/stream.c | 2 | ||||
-rw-r--r-- | stream/stream_bluray.c | 2 | ||||
-rw-r--r-- | stream/stream_cdda.c | 2 | ||||
-rw-r--r-- | stream/stream_dvd.c | 2 | ||||
-rw-r--r-- | stream/stream_lavf.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/stream/rar.c b/stream/rar.c index d0dbc8d736..9a74097ce7 100644 --- a/stream/rar.c +++ b/stream/rar.c @@ -31,7 +31,7 @@ #include <libavutil/intreadwrite.h> -#include "talloc.h" +#include "mpv_talloc.h" #include "common/common.h" #include "stream.h" #include "rar.h" diff --git a/stream/stream.c b/stream/stream.c index cf9a8ea143..77eccd76ca 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -29,7 +29,7 @@ #include "osdep/atomics.h" #include "osdep/io.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "config.h" diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c index b40c3275b3..7a58d888b9 100644 --- a/stream/stream_bluray.c +++ b/stream/stream_bluray.c @@ -38,7 +38,7 @@ #include <libavutil/common.h> #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/common.h" #include "common/msg.h" #include "options/m_option.h" diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 6781f4a0ad..8fadf3452a 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -37,7 +37,7 @@ #include <stdlib.h> #include <stdbool.h> -#include "talloc.h" +#include "mpv_talloc.h" #include "stream.h" #include "options/m_option.h" diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index 641305e7a8..55cb6dfc7b 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -35,7 +35,7 @@ #include "osdep/io.h" #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/common.h" #include "common/msg.h" diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c index ac092499b3..d899629571 100644 --- a/stream/stream_lavf.c +++ b/stream/stream_lavf.c @@ -30,7 +30,7 @@ #include "cookies.h" #include "misc/bstr.h" -#include "talloc.h" +#include "mpv_talloc.h" #define OPT_BASE_STRUCT struct stream_lavf_params struct stream_lavf_params { |