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/microdvddec.c | |
| parent | 60b75186b2c878b6257b43c8fcc0b1356ada218e (diff) | |
| parent | 9200514ad8717c63f82101dc394f4378854325bf (diff) | |
| download | ffmpeg-6f69f7a8bf6a0d013985578df2ef42ee6b1c7994.tar.gz | |
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/microdvddec.c')
| -rw-r--r-- | libavformat/microdvddec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/microdvddec.c b/libavformat/microdvddec.c index 727ff947e7..c2f1ac45cd 100644 --- a/libavformat/microdvddec.c +++ b/libavformat/microdvddec.c @@ -114,11 +114,11 @@ static int microdvd_read_header(AVFormatContext *s) has_real_fps = 1; continue; } - if (!st->codec->extradata && sscanf(line, "{DEFAULT}{}%c", &c) == 1) { - st->codec->extradata = av_strdup(line + 11); - if (!st->codec->extradata) + if (!st->codecpar->extradata && sscanf(line, "{DEFAULT}{}%c", &c) == 1) { + st->codecpar->extradata = av_strdup(line + 11); + if (!st->codecpar->extradata) return AVERROR(ENOMEM); - st->codec->extradata_size = strlen(st->codec->extradata) + 1; + st->codecpar->extradata_size = strlen(st->codecpar->extradata) + 1; continue; } } @@ -150,8 +150,8 @@ static int microdvd_read_header(AVFormatContext *s) pts_info = microdvd->frame_rate; } avpriv_set_pts_info(st, 64, pts_info.den, pts_info.num); - st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; - st->codec->codec_id = AV_CODEC_ID_MICRODVD; + st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; + st->codecpar->codec_id = AV_CODEC_ID_MICRODVD; return 0; } |