diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-04-11 17:42:55 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-04-11 17:42:55 +0200 |
| commit | 0803f4ad21c195519209bae8d18840dd810191f8 (patch) | |
| tree | f9a869011ba90c106cf5c05c3e346912a669f63a /sub/lavc_conv.c | |
| parent | 9d2980dab752280468620df49cabe7f4843f0551 (diff) | |
| parent | b968d779afb9114694976792e903b0591a71a816 (diff) | |
| download | mpv-0803f4ad21c195519209bae8d18840dd810191f8.tar.bz2 mpv-0803f4ad21c195519209bae8d18840dd810191f8.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'sub/lavc_conv.c')
| -rw-r--r-- | sub/lavc_conv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sub/lavc_conv.c b/sub/lavc_conv.c index 3dd6097d0f..3e0165a84c 100644 --- a/sub/lavc_conv.c +++ b/sub/lavc_conv.c @@ -47,6 +47,9 @@ static const char *get_lavc_format(const char *format) // For the hack involving parse_webvtt(). if (format && strcmp(format, "webvtt-webm") == 0) format = "webvtt"; + // Most text subtitles are srt/html style anyway. + if (format && strcmp(format, "text") == 0) + format = "subrip"; return format; } @@ -79,11 +82,8 @@ struct lavc_conv *lavc_conv_create(struct mp_log *log, const char *codec_name, avctx = avcodec_alloc_context3(codec); if (!avctx) goto error; - avctx->extradata_size = extradata_len; - avctx->extradata = av_malloc(extradata_len); - if (!avctx->extradata) + if (mp_lavc_set_extradata(avctx, extradata, extradata_len) < 0) goto error; - memcpy(avctx->extradata, extradata, extradata_len); if (strcmp(codec_name, "eia_608") == 0) av_dict_set(&opts, "real_time", "1", 0); if (avcodec_open2(avctx, codec, &opts) < 0) |