diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-01-18 07:27:03 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-01-18 07:27:03 +0100 |
| commit | ba9b2f1e49732d597009ba514b0132a50562cd10 (patch) | |
| tree | fa05f5feb181823ac9d3b5682a835ff825de6914 /demux/demux_edl.c | |
| parent | e1993d5ad2bdf3dd4c26474aaa2370cbc9c1cd1b (diff) | |
| parent | 7b4ccb3e9f58a0745b58e473ee6e60b381242813 (diff) | |
| download | mpv-ba9b2f1e49732d597009ba514b0132a50562cd10.tar.bz2 mpv-ba9b2f1e49732d597009ba514b0132a50562cd10.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'demux/demux_edl.c')
| -rw-r--r-- | demux/demux_edl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_edl.c b/demux/demux_edl.c index 9ba0307487..74ce7aef66 100644 --- a/demux/demux_edl.c +++ b/demux/demux_edl.c @@ -23,7 +23,7 @@ #include <inttypes.h> #include <math.h> -#include "talloc.h" +#include "mpv_talloc.h" #include "demux.h" #include "timeline.h" |