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/stream_cdda.c | |
| 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/stream_cdda.c')
| -rw-r--r-- | stream/stream_cdda.c | 2 |
1 files changed, 1 insertions, 1 deletions
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" |