diff options
| author | Anton Khirnov <anton@khirnov.net> | 2024-09-10 12:27:43 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2024-09-26 18:25:21 +0200 |
| commit | e3e66b14af9a82930be881752873e1ac2104877b (patch) | |
| tree | d63275dac5a09fb941faf4e39759b9c6f8df9710 /fftools | |
| parent | 7f7fe2a10bda086c595bc191145f2390e9781726 (diff) | |
| download | ffmpeg-e3e66b14af9a82930be881752873e1ac2104877b.tar.gz | |
fftools/ffmpeg_enc: don't write frame rate/SAR to AVStream directly
Have the muxer code read them out of the encoder context in
of_stream_init() instead.
This is a step towards decoupling encoders from muxers.
Diffstat (limited to 'fftools')
| -rw-r--r-- | fftools/ffmpeg_enc.c | 3 | ||||
| -rw-r--r-- | fftools/ffmpeg_mux.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 1be0a37353..4b3efb8db1 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -206,7 +206,6 @@ int enc_open(void *opaque, const AVFrame *frame) if (ost->type == AVMEDIA_TYPE_AUDIO || ost->type == AVMEDIA_TYPE_VIDEO) { enc_ctx->time_base = frame->time_base; enc_ctx->framerate = fd->frame_rate_filter; - ost->st->avg_frame_rate = fd->frame_rate_filter; } switch (enc_ctx->codec_type) { @@ -233,7 +232,7 @@ int enc_open(void *opaque, const AVFrame *frame) frame->height > 0); enc_ctx->width = frame->width; enc_ctx->height = frame->height; - enc_ctx->sample_aspect_ratio = ost->st->sample_aspect_ratio = + enc_ctx->sample_aspect_ratio = ost->frame_aspect_ratio.num ? // overridden by the -aspect cli option av_mul_q(ost->frame_aspect_ratio, (AVRational){ enc_ctx->height, enc_ctx->width }) : frame->sample_aspect_ratio; diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index ea0bbeed32..d38f1ec317 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -620,6 +620,9 @@ int of_stream_init(OutputFile *of, OutputStream *ost, if (ost->st->time_base.num <= 0 || ost->st->time_base.den <= 0) ost->st->time_base = av_add_q(enc_ctx->time_base, (AVRational){0, 1}); + ost->st->avg_frame_rate = enc_ctx->framerate; + ost->st->sample_aspect_ratio = enc_ctx->sample_aspect_ratio; + ret = avcodec_parameters_from_context(ms->par_in, enc_ctx); if (ret < 0) { av_log(ost, AV_LOG_FATAL, |