From cfc72d4fff568c214a465f150cb51255e34ef7f5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 24 Oct 2013 19:15:16 +0200 Subject: m_config: slightly simplify dynamic option initialization We can assume memcpy is enough, because the source should be from static data. (It wouldn't work if the data could contain pointers back into itself.) --- mpvcore/m_config.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mpvcore/m_config.c b/mpvcore/m_config.c index 0affe0d6ee..267fc92bd4 100644 --- a/mpvcore/m_config.c +++ b/mpvcore/m_config.c @@ -427,10 +427,9 @@ static struct m_config_option *m_config_add_option(struct m_config *config, assert(0); } union m_option_value temp = {0}; - m_option_copy(arg, &temp, co->data); + memcpy(&temp, co->data, arg->type->size); memset(co->data, 0, arg->type->size); m_option_copy(arg, co->data, &temp); - m_option_free(arg, &temp); } } } -- cgit v1.2.3