diff options
| author | wm4 <wm4@nowhere> | 2013-07-11 21:10:42 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-12 21:56:40 +0200 |
| commit | 52c3eb69765a0d1070bf240353095c8ff546765b (patch) | |
| tree | db654a9798f4941dbc3b57c8569fcdeb0b21d24a /core/encode_lavc.c | |
| parent | d17d2fdc7c536821b3fea8c4a37c0ad09fc487db (diff) | |
| download | mpv-52c3eb69765a0d1070bf240353095c8ff546765b.tar.bz2 mpv-52c3eb69765a0d1070bf240353095c8ff546765b.tar.xz | |
core: change open_stream and demux_open signature
This removes the dependency on DEMUXER_TYPE_* and the file_format
parameter from the stream open functions.
Remove some of the playlist handling code. It looks like this was
needed only for loading linked mov files with demux_mov (which was
removed long ago).
Delete a minor bit of dead network-related code from stream.c as well.
Diffstat (limited to 'core/encode_lavc.c')
| -rw-r--r-- | core/encode_lavc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/encode_lavc.c b/core/encode_lavc.c index 9fada7de58..75e57a2443 100644 --- a/core/encode_lavc.c +++ b/core/encode_lavc.c @@ -397,7 +397,7 @@ 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 = open_stream(buf, NULL, NULL))) { + if (!(*bytebuf = stream_open(buf, NULL))) { mp_msg(MSGT_ENCODE, MSGL_WARN, "%s: could not open '%s', " "disabling 2-pass encoding at pass 2\n", prefix, buf); stream->codec->flags &= ~CODEC_FLAG_PASS2; |