diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 20:58:15 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 20:59:55 +0100 |
| commit | 6f69f7a8bf6a0d013985578df2ef42ee6b1c7994 (patch) | |
| tree | 0c2ec8349ff1763d5f48454b8b9f26374dbd80b0 /libavformat/realtextdec.c | |
| parent | 60b75186b2c878b6257b43c8fcc0b1356ada218e (diff) | |
| parent | 9200514ad8717c63f82101dc394f4378854325bf (diff) | |
Merge commit '9200514ad8717c63f82101dc394f4378854325bf'
* commit '9200514ad8717c63f82101dc394f4378854325bf':
lavf: replace AVStream.codec with AVStream.codecpar
This has been a HUGE effort from:
- Derek Buitenhuis <derek.buitenhuis@gmail.com>
- Hendrik Leppkes <h.leppkes@gmail.com>
- wm4 <nfxjfg@googlemail.com>
- Clément Bœsch <clement@stupeflix.com>
- James Almer <jamrial@gmail.com>
- Michael Niedermayer <michael@niedermayer.cc>
- Rostislav Pehlivanov <atomnuker@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/realtextdec.c')
| -rw-r--r-- | libavformat/realtextdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/realtextdec.c b/libavformat/realtextdec.c index f13321c91a..618d4f78ec 100644 --- a/libavformat/realtextdec.c +++ b/libavformat/realtextdec.c @@ -70,8 +70,8 @@ static int realtext_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); avpriv_set_pts_info(st, 64, 1, 100); - st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; - st->codec->codec_id = AV_CODEC_ID_REALTEXT; + st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; + st->codecpar->codec_id = AV_CODEC_ID_REALTEXT; av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); @@ -89,12 +89,12 @@ static int realtext_read_header(AVFormatContext *s) if (p) duration = read_ts(p); - st->codec->extradata = av_strdup(buf.str); - if (!st->codec->extradata) { + st->codecpar->extradata = av_strdup(buf.str); + if (!st->codecpar->extradata) { res = AVERROR(ENOMEM); goto end; } - st->codec->extradata_size = buf.len + 1; + st->codecpar->extradata_size = buf.len + 1; } else { /* if we just read a <time> tag, introduce a new event, otherwise merge * with the previous one */ |