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 /video/out/bitmap_packer.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 'video/out/bitmap_packer.c')
-rw-r--r-- | video/out/bitmap_packer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/bitmap_packer.c b/video/out/bitmap_packer.c index 49a66caf43..c9111f897c 100644 --- a/video/out/bitmap_packer.c +++ b/video/out/bitmap_packer.c @@ -25,7 +25,7 @@ #include <libavutil/common.h> -#include "talloc.h" +#include "mpv_talloc.h" #include "bitmap_packer.h" #include "common/common.h" #include "sub/dec_sub.h" |