diff options
| -rw-r--r-- | player/main.c | 2 | ||||
| -rw-r--r-- | ta/ta_talloc.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/player/main.c b/player/main.c index 25bf22ef5a..cb5ebcb99d 100644 --- a/player/main.c +++ b/player/main.c @@ -264,7 +264,7 @@ struct MPContext *mp_create(void) .last_chapter = -2, .term_osd_contents = talloc_strdup(mpctx, ""), .osd_progbar = { .type = -1 }, - .playlist = talloc_struct(mpctx, struct playlist, {0}), + .playlist = talloc_zero(mpctx, struct playlist), .dispatch = mp_dispatch_create(mpctx), .playback_abort = mp_cancel_new(mpctx), .thread_pool = mp_thread_pool_create(mpctx, 0, 1, 30), diff --git a/ta/ta_talloc.h b/ta/ta_talloc.h index 982ef41ebd..259496f65b 100644 --- a/ta/ta_talloc.h +++ b/ta/ta_talloc.h @@ -156,7 +156,4 @@ char *ta_talloc_asprintf_append_buffer(char *s, const char *fmt, ...) TA_PRF(2, : false \ ) -#define talloc_struct(ctx, type, ...) \ - talloc_memdup(ctx, &(type) TA_EXPAND_ARGS(__VA_ARGS__), sizeof(type)) - #endif |