From d8d42b44fc717c695af59c14213d54885088ea37 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 21 Dec 2013 19:45:42 +0100
Subject: m_option, m_config: mp_msg conversions

Always pass around mp_log contexts in the option parser code. This of
course affects all users of this API as well.

In stream.c, pass a mp_null_log, because we can't do it properly yet.
This will be fixed later.
---
 audio/out/ao.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'audio/out')

diff --git a/audio/out/ao.c b/audio/out/ao.c
index ab2b15b031..7aea6239d2 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -149,7 +149,7 @@ static struct ao *ao_create(bool probing, struct mpv_global *global,
     };
     if (ao->driver->encode != !!ao->encode_lavc_ctx)
         goto error;
-    struct m_config *config = m_config_from_obj_desc(ao, &desc);
+    struct m_config *config = m_config_from_obj_desc(ao, ao->log, &desc);
     if (m_config_apply_defaults(config, name, global->opts->ao_defs) < 0)
         goto error;
     if (m_config_set_obj_params(config, args) < 0)
-- 
cgit v1.2.3