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

ffmpeg: drop useless framerate assignments

Browse Source 
If the input stream framerate is known, it will be configured on the
relevant filtergraph input and get propagated to the output stream in
the above line. That makes these assignments redundant.
This commit is contained in:
Anton Khirnov
2021-11-16 12:06:02 +01:00
parent 6ebaccf327
commit bb6f591c49
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fftools/ffmpeg.c
View File

@@ -3293,10 +3293,6 @@ static int init_output_stream_encode(OutputStream *ost, AVFrame *frame)
if (enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO) { if (enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO) {
if (!ost->frame_rate.num) if (!ost->frame_rate.num)
ost->frame_rate = av_buffersink_get_frame_rate(ost->filter->filter); ost->frame_rate = av_buffersink_get_frame_rate(ost->filter->filter);
if (ist && !ost->frame_rate.num)
ost->frame_rate = ist->framerate;
if (ist && !ost->frame_rate.num)
ost->frame_rate = ist->st->r_frame_rate;
if (ist && !ost->frame_rate.num && !ost->max_frame_rate.num) { if (ist && !ost->frame_rate.num && !ost->max_frame_rate.num) {
ost->frame_rate = (AVRational){25, 1}; ost->frame_rate = (AVRational){25, 1};
av_log(NULL, AV_LOG_WARNING, av_log(NULL, AV_LOG_WARNING,