diff options
| author | Anton Khirnov <anton@khirnov.net> | 2021-04-05 10:44:36 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2021-04-08 11:03:15 +0200 |
| commit | 0214da22cae08615f58f9769a4e8fb47d21aa687 (patch) | |
| tree | a659d40200e0f8fa2dd601dabb05dd48291f4755 /fftools | |
| parent | 7ec8229982de55f0c68008862e944583c18e4e47 (diff) | |
| download | ffmpeg-0214da22cae08615f58f9769a4e8fb47d21aa687.tar.gz | |
fftools/ffmpeg: when framerate is set, prefer its inverse as output timebase
Codec timebase is not well-defined for streamcopy, so it should only be
used as the last resort.
Diffstat (limited to 'fftools')
| -rw-r--r-- | fftools/ffmpeg.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 46bb014de8..8e6206647f 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3151,8 +3151,12 @@ static int init_output_stream_streamcopy(OutputStream *ost) return ret; // copy timebase while removing common factors - if (ost->st->time_base.num <= 0 || ost->st->time_base.den <= 0) - ost->st->time_base = av_add_q(av_stream_get_codec_timebase(ost->st), (AVRational){0, 1}); + if (ost->st->time_base.num <= 0 || ost->st->time_base.den <= 0) { + if (ost->frame_rate.num) + ost->st->time_base = av_inv_q(ost->frame_rate); + else + ost->st->time_base = av_add_q(av_stream_get_codec_timebase(ost->st), (AVRational){0, 1}); + } // copy estimated duration as a hint to the muxer if (ost->st->duration <= 0 && ist->st->duration > 0) |