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 /demux/demux_mf.c | |
| 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 'demux/demux_mf.c')
| -rw-r--r-- | demux/demux_mf.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/demux/demux_mf.c b/demux/demux_mf.c index 876b17a025..1284c7fd7f 100644 --- a/demux/demux_mf.c +++ b/demux/demux_mf.c @@ -68,7 +68,7 @@ static int demux_mf_fill_buffer(demuxer_t *demuxer) if (!stream) { char *filename = mf->names[mf->curr_frame]; if (filename) - stream = stream_open(filename, demuxer->opts); + stream = stream_open(filename, demuxer->global); } if (stream) { @@ -158,11 +158,9 @@ static const char *probe_format(mf_t *mf, enum demux_check check) } if (check == DEMUX_CHECK_REQUEST) { if (!mf_type) { - mp_msg(MSGT_DEMUX, MSGL_ERR, - "[demux_mf] file type was not set! (try --mf-type=ext)\n"); + MP_ERR(mf, "file type was not set! (try --mf-type=ext)\n"); } else { - mp_msg(MSGT_DEMUX, MSGL_ERR, - "[demux_mf] --mf-type set to an unknown codec!\n"); + MP_ERR(mf, "--mf-type set to an unknown codec!\n"); } } return NULL; @@ -175,9 +173,9 @@ static int demux_open_mf(demuxer_t *demuxer, enum demux_check check) if (strncmp(demuxer->stream->url, "mf://", 5) == 0 && demuxer->stream->type == STREAMTYPE_MF) - mf = open_mf_pattern(demuxer, demuxer->stream->url + 5); + mf = open_mf_pattern(demuxer, demuxer->log, demuxer->stream->url + 5); else { - mf = open_mf_single(demuxer, demuxer->stream->url); + mf = open_mf_single(demuxer, demuxer->log, demuxer->stream->url); int bog = 0; MP_TARRAY_APPEND(mf, mf->streams, bog, demuxer->stream); } |