From d8d42b44fc717c695af59c14213d54885088ea37 Mon Sep 17 00:00:00 2001 From: wm4 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. --- common/av_log.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'common/av_log.h') diff --git a/common/av_log.h b/common/av_log.h index d5c57b0aeb..e941220a11 100644 --- a/common/av_log.h +++ b/common/av_log.h @@ -1,2 +1,3 @@ void init_libav(void); -void print_libav_versions(int v); +struct mp_log; +void print_libav_versions(struct mp_log *log, int v); -- cgit v1.2.3 From d57eaa7e30a2faada712b60e75b7b2eb734cca3c Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 21 Dec 2013 20:06:36 +0100 Subject: av_log: mp_msg conversion This is pretty nasty, because FFmpeg/Libav is yet another library with a global message callback. We do something with mutexes trying to get it done, but of course we can't actually solve this problem. If more than one library in a process use FFmpeg/Libav, only one of them will get log messages. --- common/av_log.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'common/av_log.h') diff --git a/common/av_log.h b/common/av_log.h index e941220a11..17326b609f 100644 --- a/common/av_log.h +++ b/common/av_log.h @@ -1,3 +1,8 @@ -void init_libav(void); +#ifndef MP_AV_LOG_H +#define MP_AV_LOG_H +struct mpv_global; struct mp_log; +void init_libav(struct mpv_global *global); +void uninit_libav(struct mpv_global *global); void print_libav_versions(struct mp_log *log, int v); +#endif -- cgit v1.2.3