diff options
author | wm4 <wm4@nowhere> | 2013-12-21 20:24:20 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-21 21:43:16 +0100 |
commit | 3dbc9007b080028f0aebbbf8b9ab1233cd70c45b (patch) | |
tree | e6e46e5dd238338c44d421ef4f9101c9898c3cbf /demux/mf.h | |
parent | 9149e2af568d4cb251f8b105f360c3e6b9fd9d86 (diff) | |
download | mpv-3dbc9007b080028f0aebbbf8b9ab1233cd70c45b.tar.bz2 mpv-3dbc9007b080028f0aebbbf8b9ab1233cd70c45b.tar.xz |
demux: mp_msg conversions
The TV code pretends to be part of stream/, but it's actually demuxer
code too. The audio_in code is shared between the TV code and
stream_radio.c, so stream_radio.c needs a small hack until stream.c is
converted.
Diffstat (limited to 'demux/mf.h')
-rw-r--r-- | demux/mf.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/demux/mf.h b/demux/mf.h index 5511e3188b..09f6e03b4f 100644 --- a/demux/mf.h +++ b/demux/mf.h @@ -19,10 +19,13 @@ #ifndef MPLAYER_MF_H #define MPLAYER_MF_H +struct mp_log; + extern double mf_fps; extern char * mf_type; typedef struct mf { + struct mp_log *log; struct sh_video *sh; int curr_frame; int nr_of_files; @@ -31,7 +34,7 @@ typedef struct mf { struct stream **streams; } mf_t; -mf_t *open_mf_pattern(void *talloc_ctx, char *filename); -mf_t *open_mf_single(void *talloc_ctx, char *filename); +mf_t *open_mf_pattern(void *talloc_ctx, struct mp_log *log, char *filename); +mf_t *open_mf_single(void *talloc_ctx, struct mp_log *log, char *filename); #endif /* MPLAYER_MF_H */ |