diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-04-15 21:46:43 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-04-18 02:29:36 +0200 |
| commit | a74428921f8bfb33cbe0340bfd810b6945e432d2 (patch) | |
| tree | 09b7efaaaf07dd7c95f6a42a595eef98f9173d2f /libavformat/segment.c | |
| parent | 3651d6f276da32fcff8f7e6cb13513661e3c7bbc (diff) | |
| download | ffmpeg-a74428921f8bfb33cbe0340bfd810b6945e432d2.tar.gz | |
avformat/segment: Use ff_stream_encode_params_copy()
It is simpler and more complete (e.g. it copies the id).
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat/segment.c')
| -rw-r--r-- | libavformat/segment.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c index 5265ecaebb..cd72e8b701 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -167,8 +167,10 @@ static int segment_mux_init(AVFormatContext *s) if (!(st = avformat_new_stream(oc, NULL))) return AVERROR(ENOMEM); + ret = ff_stream_encode_params_copy(st, ist); + if (ret < 0) + return ret; opar = st->codecpar; - avcodec_parameters_copy(opar, ipar); if (!oc->oformat->codec_tag || av_codec_get_id (oc->oformat->codec_tag, ipar->codec_tag) == opar->codec_id || av_codec_get_tag(oc->oformat->codec_tag, ipar->codec_id) <= 0) { @@ -176,17 +178,12 @@ static int segment_mux_init(AVFormatContext *s) } else { opar->codec_tag = 0; } - st->sample_aspect_ratio = ist->sample_aspect_ratio; - st->time_base = ist->time_base; - st->avg_frame_rate = ist->avg_frame_rate; - st->disposition = ist->disposition; #if FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS if (ipar->codec_tag == MKTAG('t','m','c','d')) st->codec->time_base = ist->codec->time_base; FF_ENABLE_DEPRECATION_WARNINGS #endif - av_dict_copy(&st->metadata, ist->metadata, 0); } return 0; |