Commit a6828034 authored by Andreas Rheinhardt's avatar Andreas Rheinhardt

avformat/segment: Access AVStream more directly

by storing s->streams[i] in a pointer instead of constantly using
s->streams[i]->...
Signed-off-by: 's avatarAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
parent b2c0b377
...@@ -162,12 +162,11 @@ static int segment_mux_init(AVFormatContext *s) ...@@ -162,12 +162,11 @@ static int segment_mux_init(AVFormatContext *s)
oc->flags = s->flags; oc->flags = s->flags;
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *st; AVStream *st, *ist = s->streams[i];
AVCodecParameters *ipar, *opar; AVCodecParameters *ipar = ist->codecpar, *opar;
if (!(st = avformat_new_stream(oc, NULL))) if (!(st = avformat_new_stream(oc, NULL)))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ipar = s->streams[i]->codecpar;
opar = st->codecpar; opar = st->codecpar;
avcodec_parameters_copy(opar, ipar); avcodec_parameters_copy(opar, ipar);
if (!oc->oformat->codec_tag || if (!oc->oformat->codec_tag ||
...@@ -177,16 +176,16 @@ static int segment_mux_init(AVFormatContext *s) ...@@ -177,16 +176,16 @@ static int segment_mux_init(AVFormatContext *s)
} else { } else {
opar->codec_tag = 0; opar->codec_tag = 0;
} }
st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio; st->sample_aspect_ratio = ist->sample_aspect_ratio;
st->time_base = s->streams[i]->time_base; st->time_base = ist->time_base;
st->avg_frame_rate = s->streams[i]->avg_frame_rate; st->avg_frame_rate = ist->avg_frame_rate;
#if FF_API_LAVF_AVCTX #if FF_API_LAVF_AVCTX
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
if (s->streams[i]->codecpar->codec_tag == MKTAG('t','m','c','d')) if (ipar->codec_tag == MKTAG('t','m','c','d'))
st->codec->time_base = s->streams[i]->codec->time_base; st->codec->time_base = ist->codec->time_base;
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
av_dict_copy(&st->metadata, s->streams[i]->metadata, 0); av_dict_copy(&st->metadata, ist->metadata, 0);
} }
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment