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/mgsts.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/mgsts.c')
| -rw-r--r-- | libavformat/mgsts.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/mgsts.c b/libavformat/mgsts.c index 8cbc9521d6..0720de8d86 100644 --- a/libavformat/mgsts.c +++ b/libavformat/mgsts.c @@ -55,13 +55,13 @@ static int read_header(AVFormatContext *s) st->nb_frames = st->duration = avio_rb32(pb); fps = av_d2q(av_int2float(avio_rb32(pb)), INT_MAX); - st->codec->width = avio_rb32(pb); - st->codec->height = avio_rb32(pb); + st->codecpar->width = avio_rb32(pb); + st->codecpar->height = avio_rb32(pb); avio_skip(pb, 12); - st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_tag = avio_rb32(pb); - st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, - st->codec->codec_tag); + st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; + st->codecpar->codec_tag = avio_rb32(pb); + st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, + st->codecpar->codec_tag); avpriv_set_pts_info(st, 64, fps.den, fps.num); avio_skip(pb, 20); |