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/3dostr.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/3dostr.c')
| -rw-r--r-- | libavformat/3dostr.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/3dostr.c b/libavformat/3dostr.c index 5325a03f90..3668e5f613 100644 --- a/libavformat/3dostr.c +++ b/libavformat/3dostr.c @@ -61,17 +61,17 @@ static int threedostr_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->sample_rate = avio_rb32(s->pb); - st->codec->channels = avio_rb32(s->pb); - if (st->codec->channels <= 0) + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->sample_rate = avio_rb32(s->pb); + st->codecpar->channels = avio_rb32(s->pb); + if (st->codecpar->channels <= 0) return AVERROR_INVALIDDATA; codec = avio_rl32(s->pb); avio_skip(s->pb, 4); if (ctrl_size == 20 || ctrl_size == 3 || ctrl_size == -1) - st->duration = (avio_rb32(s->pb) - 1) / st->codec->channels; + st->duration = (avio_rb32(s->pb) - 1) / st->codecpar->channels; else - st->duration = avio_rb32(s->pb) * 16 / st->codec->channels; + st->duration = avio_rb32(s->pb) * 16 / st->codecpar->channels; size -= 56; found_shdr = 1; break; @@ -95,15 +95,15 @@ static int threedostr_read_header(AVFormatContext *s) switch (codec) { case MKTAG('S','D','X','2'): - st->codec->codec_id = AV_CODEC_ID_SDX2_DPCM; - st->codec->block_align = 1 * st->codec->channels; + st->codecpar->codec_id = AV_CODEC_ID_SDX2_DPCM; + st->codecpar->block_align = 1 * st->codecpar->channels; break; default: avpriv_request_sample(s, "codec %X", codec); return AVERROR_PATCHWELCOME; } - avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); return 0; } @@ -142,7 +142,7 @@ static int threedostr_read_packet(AVFormatContext *s, AVPacket *pkt) ret = av_get_packet(s->pb, pkt, size); pkt->pos = pos; pkt->stream_index = 0; - pkt->duration = size / st->codec->channels; + pkt->duration = size / st->codecpar->channels; size = 0; found_ssmp = 1; break; |