diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
| commit | 0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2 (patch) | |
| tree | b70f214f8c3fc802d6d6edbf8395273c854ac0fd /stream/resolve/resolve.h | |
| parent | a4fe95b0d8d339ba5afbdb5346ad8fd367a4a1c1 (diff) | |
| parent | 245e5b844177e9ad9a9c07eff5efab7c3fccdebc (diff) | |
| download | mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.bz2 mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.xz | |
Merge branch 'msg_refactor'
This branch changes mp_msg() so that it doesn't require global context.
The changes are pretty violent.
Diffstat (limited to 'stream/resolve/resolve.h')
| -rw-r--r-- | stream/resolve/resolve.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/resolve/resolve.h b/stream/resolve/resolve.h index 7a60b29114..3a5358a99e 100644 --- a/stream/resolve/resolve.h +++ b/stream/resolve/resolve.h @@ -19,8 +19,7 @@ #ifndef MP_RESOLVE_H #define MP_RESOLVE_H -struct MPContext; -struct MPOpts; +struct mpv_global; struct mp_resolve_result { char *url; @@ -48,6 +47,7 @@ struct mp_resolve_sub { char *lang; }; -struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts); +struct mp_resolve_result *mp_resolve_quvi(const char *url, + struct mpv_global *global); #endif |