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 /sub | |
| 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 'sub')
| -rw-r--r-- | sub/img_convert.c | 2 | ||||
| -rw-r--r-- | sub/lavc_conv.c | 2 | ||||
| -rw-r--r-- | sub/osd.c | 2 | ||||
| -rw-r--r-- | sub/osd_dummy.c | 2 | ||||
| -rw-r--r-- | sub/osd_libass.c | 2 | ||||
| -rw-r--r-- | sub/sd_ass.c | 2 | ||||
| -rw-r--r-- | sub/sd_lavc.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/sub/img_convert.c b/sub/img_convert.c index 1db73e1b82..4fdca3d1e2 100644 --- a/sub/img_convert.c +++ b/sub/img_convert.c @@ -21,7 +21,7 @@ #include <libavutil/mem.h> #include <libavutil/common.h> -#include "talloc.h" +#include "mpv_talloc.h" #include "common/common.h" #include "img_convert.h" diff --git a/sub/lavc_conv.c b/sub/lavc_conv.c index b244240d7c..42f9563391 100644 --- a/sub/lavc_conv.c +++ b/sub/lavc_conv.c @@ -24,7 +24,7 @@ #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/msg.h" #include "common/av_common.h" #include "misc/bstr.h" @@ -28,7 +28,7 @@ #include "osdep/timer.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "options/options.h" #include "common/global.h" #include "common/msg.h" diff --git a/sub/osd_dummy.c b/sub/osd_dummy.c index 5a33321d07..5c50569dd6 100644 --- a/sub/osd_dummy.c +++ b/sub/osd_dummy.c @@ -3,7 +3,7 @@ #include <string.h> #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "osd.h" const char *const osd_ass_0 = ""; diff --git a/sub/osd_libass.c b/sub/osd_libass.c index 6bb125723b..0c24483e32 100644 --- a/sub/osd_libass.c +++ b/sub/osd_libass.c @@ -24,7 +24,7 @@ #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "misc/bstr.h" #include "common/common.h" #include "common/msg.h" diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 767ad927e2..658e952c28 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -24,7 +24,7 @@ #include <libavutil/common.h> #include <ass/ass.h> -#include "talloc.h" +#include "mpv_talloc.h" #include "options/options.h" #include "common/common.h" diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c index d9b9f507e7..ae08026d9a 100644 --- a/sub/sd_lavc.c +++ b/sub/sd_lavc.c @@ -25,7 +25,7 @@ #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/msg.h" #include "common/av_common.h" #include "demux/stheader.h" |