diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 20:36:45 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 21:43:16 +0100 |
| commit | 0335011f11d9d13f70db6c46ed6189a74d48ec67 (patch) | |
| tree | 03a146b06b5a8c405f5c521abadeeea35c296920 /common | |
| parent | 3dbc9007b080028f0aebbbf8b9ab1233cd70c45b (diff) | |
| download | mpv-0335011f11d9d13f70db6c46ed6189a74d48ec67.tar.bz2 mpv-0335011f11d9d13f70db6c46ed6189a74d48ec67.tar.xz | |
stream: mp_msg conversions
We also drop some slave mode stuff from stream_vcd.
Diffstat (limited to 'common')
| -rw-r--r-- | common/encode_lavc.c | 9 | ||||
| -rw-r--r-- | common/playlist_parser.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/common/encode_lavc.c b/common/encode_lavc.c index 18f6395b6d..1efe388507 100644 --- a/common/encode_lavc.c +++ b/common/encode_lavc.c @@ -399,8 +399,8 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx, buf[sizeof(buf) - 1] = 0; if (value_has_flag(de ? de->value : "", "pass2")) { - if (!(*bytebuf = stream_open(buf, NULL))) { - mp_msg(MSGT_ENCODE, MSGL_WARN, "%s: could not open '%s', " + if (!(*bytebuf = stream_open(buf, ctx->global))) { + MP_WARN(ctx, "%s: could not open '%s', " "disabling 2-pass encoding at pass 2\n", prefix, buf); stream->codec->flags &= ~CODEC_FLAG_PASS2; set_to_avdictionary(ctx, dictp, "flags", "-pass2"); @@ -421,9 +421,8 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx, } if (value_has_flag(de ? de->value : "", "pass1")) { - if (!(*bytebuf = open_output_stream(buf, NULL))) { - mp_msg( - MSGT_ENCODE, MSGL_WARN, + if (!(*bytebuf = open_output_stream(buf, ctx->global))) { + MP_WARN(ctx, "%s: could not open '%s', disabling " "2-pass encoding at pass 1\n", prefix, ctx->avc->filename); diff --git a/common/playlist_parser.c b/common/playlist_parser.c index f33f7204b6..2e06009db5 100644 --- a/common/playlist_parser.c +++ b/common/playlist_parser.c @@ -499,7 +499,7 @@ struct playlist *playlist_parse_file(const char *file, struct mpv_global *global { struct mp_log *log = mp_log_new(NULL, global->log, "!playlist_parser"); struct playlist *ret = NULL; - stream_t *stream = stream_open(file, global->opts); + stream_t *stream = stream_open(file, global); if(!stream) { mp_err(log, "Error while opening playlist file %s: %s\n", file, strerror(errno)); |