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 /common/playlist_parser.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 'common/playlist_parser.h')
| -rw-r--r-- | common/playlist_parser.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/common/playlist_parser.h b/common/playlist_parser.h index a541aa2cb4..9d139d90f3 100644 --- a/common/playlist_parser.h +++ b/common/playlist_parser.h @@ -19,11 +19,9 @@ #ifndef MPLAYER_PLAYLISTPARSER_H #define MPLAYER_PLAYLISTPARSER_H -#include <stdbool.h> - -struct MPOpts; +struct mpv_global; struct playlist; -struct playlist *playlist_parse_file(const char *file, struct MPOpts *opts); +struct playlist *playlist_parse_file(const char *file, struct mpv_global *global); #endif |