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/lvfdec.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/lvfdec.c')
| -rw-r--r-- | libavformat/lvfdec.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libavformat/lvfdec.c b/libavformat/lvfdec.c index 81aec599ba..b8af25609f 100644 --- a/libavformat/lvfdec.c +++ b/libavformat/lvfdec.c @@ -62,14 +62,14 @@ static int lvf_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); - st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; avio_skip(s->pb, 4); - st->codec->width = avio_rl32(s->pb); - st->codec->height = avio_rl32(s->pb); + st->codecpar->width = avio_rl32(s->pb); + st->codecpar->height = avio_rl32(s->pb); avio_skip(s->pb, 4); - st->codec->codec_tag = avio_rl32(s->pb); - st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, - st->codec->codec_tag); + st->codecpar->codec_tag = avio_rl32(s->pb); + st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, + st->codecpar->codec_tag); avpriv_set_pts_info(st, 32, 1, 1000); break; case MKTAG('0', '1', 'f', 'm'): @@ -77,14 +77,14 @@ static int lvf_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_tag = avio_rl16(s->pb); - st->codec->channels = avio_rl16(s->pb); - st->codec->sample_rate = avio_rl16(s->pb); + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_tag = avio_rl16(s->pb); + st->codecpar->channels = avio_rl16(s->pb); + st->codecpar->sample_rate = avio_rl16(s->pb); avio_skip(s->pb, 8); - st->codec->bits_per_coded_sample = avio_r8(s->pb); - st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, - st->codec->codec_tag); + st->codecpar->bits_per_coded_sample = avio_r8(s->pb); + st->codecpar->codec_id = ff_codec_get_id(ff_codec_wav_tags, + st->codecpar->codec_tag); avpriv_set_pts_info(st, 32, 1, 1000); break; case 0: |