2010-01-30 23:26:47 +01:00
|
|
|
/*
|
|
|
|
* This file is part of MPlayer.
|
|
|
|
*
|
|
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
2012-12-10 01:28:20 +01:00
|
|
|
#include <libavformat/avformat.h>
|
|
|
|
#include <libavformat/avio.h>
|
|
|
|
#include <libavutil/opt.h>
|
2009-11-17 17:09:17 +01:00
|
|
|
|
2012-12-10 01:28:20 +01:00
|
|
|
#include "config.h"
|
2013-12-17 02:02:25 +01:00
|
|
|
#include "options/options.h"
|
2013-12-22 13:28:55 +01:00
|
|
|
#include "options/path.h"
|
2013-12-17 02:39:45 +01:00
|
|
|
#include "common/msg.h"
|
2014-07-05 16:45:56 +02:00
|
|
|
#include "common/tags.h"
|
2014-07-30 01:15:42 +02:00
|
|
|
#include "common/av_common.h"
|
2009-11-17 17:09:17 +01:00
|
|
|
#include "stream.h"
|
2013-12-17 02:02:25 +01:00
|
|
|
#include "options/m_option.h"
|
2009-11-17 17:09:17 +01:00
|
|
|
|
2013-01-24 16:05:52 +01:00
|
|
|
#include "cookies.h"
|
|
|
|
|
2013-12-17 02:39:45 +01:00
|
|
|
#include "bstr/bstr.h"
|
2013-12-17 02:18:16 +01:00
|
|
|
#include "talloc.h"
|
2013-07-02 12:18:54 +02:00
|
|
|
|
2014-07-30 01:15:42 +02:00
|
|
|
struct stream_lavf_params *stream_lavf_opts;
|
|
|
|
|
|
|
|
#define OPT_BASE_STRUCT struct stream_lavf_params
|
|
|
|
struct stream_lavf_params {
|
|
|
|
char **avopts;
|
|
|
|
};
|
|
|
|
|
|
|
|
const struct m_sub_options stream_lavf_conf = {
|
|
|
|
.opts = (const m_option_t[]) {
|
|
|
|
OPT_KEYVALUELIST("stream-lavf-o", avopts, 0),
|
|
|
|
{0}
|
|
|
|
},
|
|
|
|
.size = sizeof(struct stream_lavf_params),
|
|
|
|
};
|
|
|
|
|
2014-05-24 14:06:13 +02:00
|
|
|
static int open_f(stream_t *stream);
|
2014-07-05 16:45:56 +02:00
|
|
|
static struct mp_tags *read_icy(stream_t *stream);
|
2013-01-24 18:45:24 +01:00
|
|
|
|
2009-11-17 17:09:17 +01:00
|
|
|
static int fill_buffer(stream_t *s, char *buffer, int max_len)
|
|
|
|
{
|
2011-12-25 00:20:12 +01:00
|
|
|
AVIOContext *avio = s->priv;
|
2013-01-24 18:45:24 +01:00
|
|
|
if (!avio)
|
|
|
|
return -1;
|
2011-12-25 00:20:12 +01:00
|
|
|
int r = avio_read(avio, buffer, max_len);
|
2009-11-17 17:09:17 +01:00
|
|
|
return (r <= 0) ? -1 : r;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int write_buffer(stream_t *s, char *buffer, int len)
|
|
|
|
{
|
2011-12-25 00:20:12 +01:00
|
|
|
AVIOContext *avio = s->priv;
|
2013-01-24 18:45:24 +01:00
|
|
|
if (!avio)
|
|
|
|
return -1;
|
2011-12-25 00:20:12 +01:00
|
|
|
avio_write(avio, buffer, len);
|
|
|
|
avio_flush(avio);
|
|
|
|
if (avio->error)
|
|
|
|
return -1;
|
|
|
|
return len;
|
2009-11-17 17:09:17 +01:00
|
|
|
}
|
|
|
|
|
2012-11-18 20:46:12 +01:00
|
|
|
static int seek(stream_t *s, int64_t newpos)
|
2009-11-17 17:09:17 +01:00
|
|
|
{
|
2011-12-25 00:20:12 +01:00
|
|
|
AVIOContext *avio = s->priv;
|
2013-01-24 18:45:24 +01:00
|
|
|
if (!avio)
|
|
|
|
return -1;
|
2013-08-22 18:23:33 +02:00
|
|
|
if (avio_seek(avio, newpos, SEEK_SET) < 0) {
|
2009-11-17 17:09:17 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2013-01-24 18:45:24 +01:00
|
|
|
static void close_f(stream_t *stream)
|
|
|
|
{
|
|
|
|
AVIOContext *avio = stream->priv;
|
|
|
|
/* NOTE: As of 2011 write streams must be manually flushed before close.
|
|
|
|
* Currently write_buffer() always flushes them after writing.
|
|
|
|
* avio_close() could return an error, but we have no way to return that
|
|
|
|
* with the current stream API.
|
|
|
|
*/
|
|
|
|
if (avio)
|
|
|
|
avio_close(avio);
|
|
|
|
}
|
|
|
|
|
2009-11-17 17:09:17 +01:00
|
|
|
static int control(stream_t *s, int cmd, void *arg)
|
|
|
|
{
|
2012-04-18 00:27:55 +02:00
|
|
|
AVIOContext *avio = s->priv;
|
2013-01-24 18:45:24 +01:00
|
|
|
if (!avio && cmd != STREAM_CTRL_RECONNECT)
|
|
|
|
return -1;
|
2010-04-23 22:50:34 +02:00
|
|
|
int64_t size, ts;
|
|
|
|
double pts;
|
2009-11-17 17:09:17 +01:00
|
|
|
switch(cmd) {
|
|
|
|
case STREAM_CTRL_GET_SIZE:
|
2011-12-25 00:20:12 +01:00
|
|
|
size = avio_size(avio);
|
2014-05-24 14:04:09 +02:00
|
|
|
if (size >= 0) {
|
|
|
|
*(int64_t *)arg = size;
|
2009-11-17 17:09:17 +01:00
|
|
|
return 1;
|
|
|
|
}
|
2010-04-23 22:50:34 +02:00
|
|
|
break;
|
|
|
|
case STREAM_CTRL_SEEK_TO_TIME:
|
|
|
|
pts = *(double *)arg;
|
|
|
|
ts = pts * AV_TIME_BASE;
|
2011-12-25 00:20:12 +01:00
|
|
|
ts = avio_seek_time(avio, -1, ts, 0);
|
2010-04-23 22:50:34 +02:00
|
|
|
if (ts >= 0)
|
|
|
|
return 1;
|
|
|
|
break;
|
2013-07-02 12:18:54 +02:00
|
|
|
case STREAM_CTRL_GET_METADATA: {
|
2014-07-05 16:45:56 +02:00
|
|
|
*(struct mp_tags **)arg = read_icy(s);
|
|
|
|
if (!*(struct mp_tags **)arg)
|
2013-07-02 12:18:54 +02:00
|
|
|
break;
|
|
|
|
return 1;
|
|
|
|
}
|
2013-01-24 18:45:24 +01:00
|
|
|
case STREAM_CTRL_RECONNECT: {
|
|
|
|
if (avio && avio->write_flag)
|
|
|
|
break; // don't bother with this
|
|
|
|
// avio doesn't seem to support this - emulate it by reopening
|
|
|
|
close_f(s);
|
|
|
|
s->priv = NULL;
|
2014-05-24 14:06:13 +02:00
|
|
|
return open_f(s);
|
2013-01-24 18:45:24 +01:00
|
|
|
}
|
2009-11-17 17:09:17 +01:00
|
|
|
}
|
|
|
|
return STREAM_UNSUPPORTED;
|
|
|
|
}
|
|
|
|
|
2014-04-25 19:13:12 +02:00
|
|
|
static int interrupt_cb(void *ctx)
|
|
|
|
{
|
|
|
|
struct stream *stream = ctx;
|
|
|
|
return stream_check_interrupt(stream);
|
|
|
|
}
|
|
|
|
|
2012-09-07 18:39:46 +02:00
|
|
|
static const char * const prefix[] = { "lavf://", "ffmpeg://" };
|
2009-11-17 17:09:17 +01:00
|
|
|
|
2014-05-24 14:06:13 +02:00
|
|
|
static int open_f(stream_t *stream)
|
2009-11-17 17:09:17 +01:00
|
|
|
{
|
2013-12-22 13:11:22 +01:00
|
|
|
struct MPOpts *opts = stream->opts;
|
2011-12-25 00:20:12 +01:00
|
|
|
AVIOContext *avio = NULL;
|
2009-11-17 17:09:17 +01:00
|
|
|
int res = STREAM_ERROR;
|
2013-01-24 16:05:52 +01:00
|
|
|
AVDictionary *dict = NULL;
|
2012-12-08 15:41:03 +01:00
|
|
|
void *temp = talloc_new(NULL);
|
2009-11-17 17:09:17 +01:00
|
|
|
|
2014-05-24 14:04:09 +02:00
|
|
|
stream->seek = NULL;
|
|
|
|
stream->seekable = false;
|
|
|
|
|
2014-05-24 14:06:13 +02:00
|
|
|
int flags = stream->mode == STREAM_WRITE ? AVIO_FLAG_WRITE : AVIO_FLAG_READ;
|
2009-11-17 17:09:17 +01:00
|
|
|
|
2012-12-08 15:41:03 +01:00
|
|
|
const char *filename = stream->url;
|
|
|
|
if (!filename) {
|
2014-05-24 14:06:09 +02:00
|
|
|
MP_ERR(stream, "No URL\n");
|
2009-11-17 17:09:17 +01:00
|
|
|
goto out;
|
|
|
|
}
|
2012-09-07 18:39:46 +02:00
|
|
|
for (int i = 0; i < sizeof(prefix) / sizeof(prefix[0]); i++)
|
|
|
|
if (!strncmp(filename, prefix[i], strlen(prefix[i])))
|
|
|
|
filename += strlen(prefix[i]);
|
|
|
|
if (!strncmp(filename, "rtsp:", 5)) {
|
|
|
|
/* This is handled as a special demuxer, without a separate
|
2013-11-21 16:08:09 +01:00
|
|
|
* stream layer. demux_lavf will do all the real work. Note
|
|
|
|
* that libavformat doesn't even provide a protocol entry for
|
|
|
|
* this (the rtsp demuxer's probe function checks for a "rtsp:"
|
|
|
|
* filename prefix), so it has to be handled specially here.
|
2012-09-07 18:39:46 +02:00
|
|
|
*/
|
2013-07-11 21:10:42 +02:00
|
|
|
stream->demuxer = "lavf";
|
2012-09-07 18:39:46 +02:00
|
|
|
stream->lavf_type = "rtsp";
|
2013-11-21 16:08:09 +01:00
|
|
|
talloc_free(temp);
|
2012-09-07 18:39:46 +02:00
|
|
|
return STREAM_OK;
|
|
|
|
}
|
2014-05-24 14:06:09 +02:00
|
|
|
MP_VERBOSE(stream, "Opening %s\n", filename);
|
2009-11-17 17:09:17 +01:00
|
|
|
|
2012-12-08 15:41:03 +01:00
|
|
|
// Replace "mms://" with "mmsh://", so that most mms:// URLs just work.
|
|
|
|
bstr b_filename = bstr0(filename);
|
|
|
|
if (bstr_eatstart0(&b_filename, "mms://") ||
|
|
|
|
bstr_eatstart0(&b_filename, "mmshttp://"))
|
|
|
|
{
|
|
|
|
filename = talloc_asprintf(temp, "mmsh://%.*s", BSTR_P(b_filename));
|
|
|
|
}
|
|
|
|
|
2013-01-24 16:05:52 +01:00
|
|
|
// HTTP specific options (other protocols ignore them)
|
2013-12-22 13:11:22 +01:00
|
|
|
if (opts->network_useragent)
|
|
|
|
av_dict_set(&dict, "user-agent", opts->network_useragent, 0);
|
|
|
|
if (opts->network_cookies_enabled) {
|
|
|
|
char *file = opts->network_cookies_file;
|
2013-12-22 13:28:55 +01:00
|
|
|
if (file && file[0])
|
|
|
|
file = mp_get_user_path(temp, stream->global, file);
|
|
|
|
char *cookies = cookies_lavf(temp, stream->log, file);
|
|
|
|
if (cookies && cookies[0])
|
|
|
|
av_dict_set(&dict, "cookies", cookies, 0);
|
2013-12-22 13:11:22 +01:00
|
|
|
}
|
|
|
|
av_dict_set(&dict, "tls_verify", opts->network_tls_verify ? "1" : "0", 0);
|
|
|
|
if (opts->network_tls_ca_file)
|
|
|
|
av_dict_set(&dict, "ca_file", opts->network_tls_ca_file, 0);
|
2013-01-24 16:05:52 +01:00
|
|
|
char *cust_headers = talloc_strdup(temp, "");
|
2013-12-22 13:11:22 +01:00
|
|
|
if (opts->network_referrer) {
|
2013-01-24 16:05:52 +01:00
|
|
|
cust_headers = talloc_asprintf_append(cust_headers, "Referer: %s\r\n",
|
2013-12-22 13:11:22 +01:00
|
|
|
opts->network_referrer);
|
2013-01-24 16:05:52 +01:00
|
|
|
}
|
2013-12-22 13:11:22 +01:00
|
|
|
if (opts->network_http_header_fields) {
|
|
|
|
for (int n = 0; opts->network_http_header_fields[n]; n++) {
|
2013-01-24 16:05:52 +01:00
|
|
|
cust_headers = talloc_asprintf_append(cust_headers, "%s\r\n",
|
2013-12-22 13:11:22 +01:00
|
|
|
opts->network_http_header_fields[n]);
|
2013-01-24 16:05:52 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (strlen(cust_headers))
|
|
|
|
av_dict_set(&dict, "headers", cust_headers, 0);
|
2013-07-02 12:18:54 +02:00
|
|
|
av_dict_set(&dict, "icy", "1", 0);
|
2014-07-30 01:15:42 +02:00
|
|
|
mp_set_avdict(&dict, opts->stream_lavf_opts->avopts);
|
2013-01-24 16:05:52 +01:00
|
|
|
|
2014-04-25 19:13:12 +02:00
|
|
|
AVIOInterruptCB cb = {
|
|
|
|
.callback = interrupt_cb,
|
|
|
|
.opaque = stream,
|
|
|
|
};
|
|
|
|
|
|
|
|
int err = avio_open2(&avio, filename, flags, &cb, &dict);
|
2012-12-27 21:19:33 +01:00
|
|
|
if (err < 0) {
|
|
|
|
if (err == AVERROR_PROTOCOL_NOT_FOUND)
|
2014-05-24 14:06:09 +02:00
|
|
|
MP_ERR(stream, "Protocol not found. Make sure"
|
2012-12-27 21:19:33 +01:00
|
|
|
" ffmpeg/Libav is compiled with networking support.\n");
|
2009-11-17 17:09:17 +01:00
|
|
|
goto out;
|
2012-12-27 21:19:33 +01:00
|
|
|
}
|
2009-11-17 17:09:17 +01:00
|
|
|
|
2013-09-22 02:20:18 +02:00
|
|
|
AVDictionaryEntry *t = NULL;
|
|
|
|
while ((t = av_dict_get(dict, "", t, AV_DICT_IGNORE_SUFFIX))) {
|
2014-05-24 14:06:09 +02:00
|
|
|
MP_VERBOSE(stream, "Could not set stream option %s=%s\n",
|
|
|
|
t->key, t->value);
|
2013-09-22 02:20:18 +02:00
|
|
|
}
|
|
|
|
|
2014-03-16 10:04:46 +01:00
|
|
|
if (avio->av_class) {
|
2012-12-10 01:28:20 +01:00
|
|
|
uint8_t *mt = NULL;
|
2013-07-02 12:18:54 +02:00
|
|
|
if (av_opt_get(avio, "mime_type", AV_OPT_SEARCH_CHILDREN, &mt) >= 0) {
|
2012-12-10 01:28:20 +01:00
|
|
|
stream->mime_type = talloc_strdup(stream, mt);
|
2013-07-02 12:18:54 +02:00
|
|
|
av_free(mt);
|
|
|
|
}
|
2012-12-10 01:28:20 +01:00
|
|
|
}
|
|
|
|
|
2013-11-04 19:57:39 +01:00
|
|
|
if (strncmp(filename, "rtmp", 4) == 0) {
|
|
|
|
stream->demuxer = "lavf";
|
|
|
|
stream->lavf_type = "flv";
|
|
|
|
}
|
2011-12-25 00:20:12 +01:00
|
|
|
stream->priv = avio;
|
2014-05-24 14:04:09 +02:00
|
|
|
stream->seekable = avio->seekable;
|
|
|
|
stream->seek = stream->seekable ? seek : NULL;
|
2012-09-07 18:39:46 +02:00
|
|
|
stream->fill_buffer = fill_buffer;
|
|
|
|
stream->write_buffer = write_buffer;
|
|
|
|
stream->control = control;
|
|
|
|
stream->close = close_f;
|
2012-12-01 23:52:04 +01:00
|
|
|
// enable cache (should be avoided for files, but no way to detect this)
|
|
|
|
stream->streaming = true;
|
2009-11-17 17:09:17 +01:00
|
|
|
res = STREAM_OK;
|
|
|
|
|
|
|
|
out:
|
2013-01-24 16:05:52 +01:00
|
|
|
av_dict_free(&dict);
|
2012-12-08 15:41:03 +01:00
|
|
|
talloc_free(temp);
|
2009-11-17 17:09:17 +01:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2014-07-05 16:45:56 +02:00
|
|
|
static struct mp_tags *read_icy(stream_t *s)
|
2013-07-02 12:18:54 +02:00
|
|
|
{
|
|
|
|
AVIOContext *avio = s->priv;
|
|
|
|
|
2014-03-16 10:04:46 +01:00
|
|
|
if (!avio->av_class)
|
2013-07-02 12:18:54 +02:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
uint8_t *icy_header = NULL;
|
|
|
|
if (av_opt_get(avio, "icy_metadata_headers", AV_OPT_SEARCH_CHILDREN,
|
|
|
|
&icy_header) < 0)
|
|
|
|
icy_header = NULL;
|
|
|
|
|
|
|
|
uint8_t *icy_packet;
|
|
|
|
if (av_opt_get(avio, "icy_metadata_packet", AV_OPT_SEARCH_CHILDREN,
|
|
|
|
&icy_packet) < 0)
|
|
|
|
icy_packet = NULL;
|
|
|
|
|
2014-07-05 16:45:56 +02:00
|
|
|
// Send a metadata update only 1. on start, and 2. on a new metadata packet.
|
|
|
|
// To detect new packages, set the icy_metadata_packet to "-" once we've
|
|
|
|
// read it (a bit hacky, but works).
|
2013-07-02 12:18:54 +02:00
|
|
|
|
2014-07-05 16:45:56 +02:00
|
|
|
struct mp_tags *res = NULL;
|
2013-07-02 12:18:54 +02:00
|
|
|
if ((!icy_header || !icy_header[0]) && (!icy_packet || !icy_packet[0]))
|
|
|
|
goto done;
|
|
|
|
|
2014-07-05 16:45:56 +02:00
|
|
|
bstr packet = bstr0(icy_packet);
|
|
|
|
if (bstr_equals0(packet, "-"))
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
res = talloc_zero(NULL, struct mp_tags);
|
|
|
|
|
2013-07-02 12:18:54 +02:00
|
|
|
bstr header = bstr0(icy_header);
|
|
|
|
while (header.len) {
|
|
|
|
bstr line = bstr_strip_linebreaks(bstr_getline(header, &header));
|
|
|
|
bstr name, val;
|
2014-07-05 16:45:56 +02:00
|
|
|
if (bstr_split_tok(line, ": ", &name, &val))
|
|
|
|
mp_tags_set_bstr(res, name, val);
|
2013-07-02 12:18:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
bstr head = bstr0("StreamTitle='");
|
|
|
|
int i = bstr_find(packet, head);
|
|
|
|
if (i >= 0) {
|
|
|
|
packet = bstr_cut(packet, i + head.len);
|
|
|
|
int end = bstrchr(packet, '\'');
|
|
|
|
packet = bstr_splice(packet, 0, end);
|
2014-07-05 16:45:56 +02:00
|
|
|
mp_tags_set_bstr(res, bstr0("icy-title"), packet);
|
2013-07-02 12:18:54 +02:00
|
|
|
}
|
|
|
|
|
2014-07-05 16:45:56 +02:00
|
|
|
av_opt_set(avio, "icy_metadata_packet", "-", AV_OPT_SEARCH_CHILDREN);
|
2013-07-02 12:18:54 +02:00
|
|
|
|
|
|
|
done:
|
|
|
|
av_free(icy_header);
|
|
|
|
av_free(icy_packet);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2009-11-17 17:09:17 +01:00
|
|
|
const stream_info_t stream_info_ffmpeg = {
|
stream: fix url_options field, make protocols field not fixed length
The way the url_options field was handled was not entirely sane: it's
actually a flexible array member, so it points to garbage for streams
which do not initialize this member (it just points to the data right
after the struct, which is garbage in theory and practice). This was
not actually a problem, since the field is only used if priv_size is
set (due to how this stuff is used). But it doesn't allow setting
priv_size only, which might be useful in some cases.
Also, make the protocols array not a fixed size array. Most stream
implementations have only 1 protocol prefix, but stream_lavf.c has
over 10 (whitelists ffmpeg protocols). The high size of the fixed
size protocol array wastes space, and it is _still_ annoying to
add new prefixes to stream_lavf (have to bump the maximum length),
so make it arbitrary length.
The two changes (plus some more cosmetic changes) arte conflated into
one, because it was annoying going over all the stream implementations.
2013-08-25 22:49:27 +02:00
|
|
|
.name = "ffmpeg",
|
|
|
|
.open = open_f,
|
2014-06-10 23:56:05 +02:00
|
|
|
.protocols = (const char *const[]){
|
stream: fix url_options field, make protocols field not fixed length
The way the url_options field was handled was not entirely sane: it's
actually a flexible array member, so it points to garbage for streams
which do not initialize this member (it just points to the data right
after the struct, which is garbage in theory and practice). This was
not actually a problem, since the field is only used if priv_size is
set (due to how this stuff is used). But it doesn't allow setting
priv_size only, which might be useful in some cases.
Also, make the protocols array not a fixed size array. Most stream
implementations have only 1 protocol prefix, but stream_lavf.c has
over 10 (whitelists ffmpeg protocols). The high size of the fixed
size protocol array wastes space, and it is _still_ annoying to
add new prefixes to stream_lavf (have to bump the maximum length),
so make it arbitrary length.
The two changes (plus some more cosmetic changes) arte conflated into
one, because it was annoying going over all the stream implementations.
2013-08-25 22:49:27 +02:00
|
|
|
"lavf", "ffmpeg", "rtmp", "rtsp", "http", "https", "mms", "mmst", "mmsh",
|
2013-11-04 19:57:13 +01:00
|
|
|
"mmshttp", "udp", "ftp", "rtp", "httpproxy", "hls", "rtmpe", "rtmps",
|
|
|
|
"rtmpt", "rtmpte", "rtmpts", "srtp", "tcp", "udp", "tls", "unix", "sftp",
|
|
|
|
"md5",
|
stream: fix url_options field, make protocols field not fixed length
The way the url_options field was handled was not entirely sane: it's
actually a flexible array member, so it points to garbage for streams
which do not initialize this member (it just points to the data right
after the struct, which is garbage in theory and practice). This was
not actually a problem, since the field is only used if priv_size is
set (due to how this stuff is used). But it doesn't allow setting
priv_size only, which might be useful in some cases.
Also, make the protocols array not a fixed size array. Most stream
implementations have only 1 protocol prefix, but stream_lavf.c has
over 10 (whitelists ffmpeg protocols). The high size of the fixed
size protocol array wastes space, and it is _still_ annoying to
add new prefixes to stream_lavf (have to bump the maximum length),
so make it arbitrary length.
The two changes (plus some more cosmetic changes) arte conflated into
one, because it was annoying going over all the stream implementations.
2013-08-25 22:49:27 +02:00
|
|
|
NULL },
|
2014-05-24 14:06:13 +02:00
|
|
|
.can_write = true,
|
2009-11-17 17:09:17 +01:00
|
|
|
};
|