virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/segment: Use ff_stream_encode_params_copy()

Browse Source 
It is simpler and more complete (e.g. it copies the id).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-04-15 21:46:43 +02:00
parent 3651d6f276
commit a74428921f
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/segment.c
View File

@@ -167,8 +167,10 @@ static int segment_mux_init(AVFormatContext *s)
if (!(st = avformat_new_stream(oc, NULL))) if (!(st = avformat_new_stream(oc, NULL)))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_stream_encode_params_copy(st, ist);
if (ret < 0)
return ret;
opar = st->codecpar; opar = st->codecpar;
avcodec_parameters_copy(opar, ipar);
if (!oc->oformat->codec_tag || if (!oc->oformat->codec_tag ||
av_codec_get_id (oc->oformat->codec_tag, ipar->codec_tag) == opar->codec_id || 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) { av_codec_get_tag(oc->oformat->codec_tag, ipar->codec_id) <= 0) {
@@ -176,17 +178,12 @@ static int segment_mux_init(AVFormatContext *s)
} else { } else {
opar->codec_tag = 0; 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 #if FF_API_LAVF_AVCTX
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
if (ipar->codec_tag == MKTAG('t','m','c','d')) if (ipar->codec_tag == MKTAG('t','m','c','d'))
st->codec->time_base = ist->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, ist->metadata, 0);
} }
return 0; return 0;