diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /stream/tv.c | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'stream/tv.c')
| -rw-r--r-- | stream/tv.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/stream/tv.c b/stream/tv.c index 0b34b566d8..89783374f9 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -145,7 +145,7 @@ const struct m_sub_options tv_params_conf = { tvi_handle_t *tv_new_handle(int size, struct mp_log *log, const tvi_functions_t *functions) { - tvi_handle_t *h = malloc(sizeof(*h)); + tvi_handle_t *h = calloc(1, sizeof(*h)); if (!h) return NULL; @@ -159,12 +159,9 @@ tvi_handle_t *tv_new_handle(int size, struct mp_log *log, const tvi_functions_t h->log = log; h->functions = functions; - h->seq = 0; h->chanlist = -1; - h->chanlist_s = NULL; h->norm = -1; h->channel = -1; - h->scan = NULL; return h; } |