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/sbgdec.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/sbgdec.c')
| -rw-r--r-- | libavformat/sbgdec.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c index 03cd9226c9..bb020d7f9a 100644 --- a/libavformat/sbgdec.c +++ b/libavformat/sbgdec.c @@ -1324,7 +1324,7 @@ static int generate_intervals(void *log, struct sbg_script *s, int sample_rate, return 0; } -static int encode_intervals(struct sbg_script *s, AVCodecContext *avc, +static int encode_intervals(struct sbg_script *s, AVCodecParameters *par, struct ws_intervals *inter) { int i, edata_size = 4; @@ -1336,9 +1336,9 @@ static int encode_intervals(struct sbg_script *s, AVCodecContext *avc, if (edata_size < 0) return AVERROR(ENOMEM); } - if (ff_alloc_extradata(avc, edata_size)) + if (ff_alloc_extradata(par, edata_size)) return AVERROR(ENOMEM); - edata = avc->extradata; + edata = par->extradata; #define ADD_EDATA32(v) do { AV_WL32(edata, (v)); edata += 4; } while(0) #define ADD_EDATA64(v) do { AV_WL64(edata, (v)); edata += 8; } while(0) @@ -1362,7 +1362,7 @@ static int encode_intervals(struct sbg_script *s, AVCodecContext *avc, break; } } - if (edata != avc->extradata + edata_size) + if (edata != par->extradata + edata_size) return AVERROR_BUG; return 0; } @@ -1414,13 +1414,13 @@ static av_cold int sbg_read_header(AVFormatContext *avf) st = avformat_new_stream(avf, NULL); if (!st) return AVERROR(ENOMEM); - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = AV_CODEC_ID_FFWAVESYNTH; - st->codec->channels = 2; - st->codec->channel_layout = AV_CH_LAYOUT_STEREO; - st->codec->sample_rate = sbg->sample_rate; - st->codec->frame_size = sbg->frame_size; - avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = AV_CODEC_ID_FFWAVESYNTH; + st->codecpar->channels = 2; + st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + st->codecpar->sample_rate = sbg->sample_rate; + st->codecpar->frame_size = sbg->frame_size; + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); st->probe_packets = 0; st->start_time = av_rescale(script.start_ts, sbg->sample_rate, AV_TIME_BASE); @@ -1428,7 +1428,7 @@ static av_cold int sbg_read_header(AVFormatContext *avf) av_rescale(script.end_ts - script.start_ts, sbg->sample_rate, AV_TIME_BASE); st->cur_dts = st->start_time; - r = encode_intervals(&script, st->codec, &inter); + r = encode_intervals(&script, st->codecpar, &inter); if (r < 0) goto fail; @@ -1448,7 +1448,7 @@ static int sbg_read_packet(AVFormatContext *avf, AVPacket *packet) int64_t ts, end_ts; ts = avf->streams[0]->cur_dts; - end_ts = ts + avf->streams[0]->codec->frame_size; + end_ts = ts + avf->streams[0]->codecpar->frame_size; if (avf->streams[0]->duration != AV_NOPTS_VALUE) end_ts = FFMIN(avf->streams[0]->start_time + avf->streams[0]->duration, end_ts); |