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/demux_mf.c | |
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/demux_mf.c')
-rw-r--r-- | demux/demux_mf.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/demux/demux_mf.c b/demux/demux_mf.c index 876b17a025..1d80cfaa85 100644 --- a/demux/demux_mf.c +++ b/demux/demux_mf.c @@ -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); } |