diff mbox series

[FFmpeg-devel,12/13] fftools/ffmpeg: remove a useless inner block

Message ID 20221126081911.31275-12-anton@khirnov.net
State Accepted
Commit d04ec7efe3370b9bb39ddaca2a014f47f6ff5993
Headers show
Series [FFmpeg-devel,01/13] fftools/ffmpeg: stop explicitly closing decoders | expand

Checks

Context Check Description
yinshiyou/make_fate_loongarch64 success Make fate finished
yinshiyou/make_loongarch64 warning New warnings during build
andriy/make_fate_x86 success Make fate finished
andriy/make_x86 warning New warnings during build

Commit Message

Anton Khirnov Nov. 26, 2022, 8:19 a.m. UTC 
adjust_frame_pts_to_encoder_tb() is so small that this serves no useful
purpose.
---
 fftools/ffmpeg.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 0128476f57..045cc609b9 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -676,17 +676,18 @@  static double adjust_frame_pts_to_encoder_tb(OutputFile *of, OutputStream *ost,
                                              AVFrame *frame)
 {
     double float_pts = AV_NOPTS_VALUE; // this is identical to frame.pts but with higher precision
-    AVCodecContext *enc = ost->enc_ctx;
-    AVRational filter_tb = (AVRational){ -1, -1 };
+    const int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ?
+                               0 : of->start_time;
+
+    AVCodecContext *const enc = ost->enc_ctx;
+
+    AVRational        tb = enc->time_base;
+    AVRational filter_tb = frame->time_base;
+    const int extra_bits = av_clip(29 - av_log2(tb.den), 0, 16);
+
     if (frame->pts == AV_NOPTS_VALUE)
         goto early_exit;
 
-    {
-        int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time;
-        AVRational tb = enc->time_base;
-        int extra_bits = av_clip(29 - av_log2(tb.den), 0, 16);
-        filter_tb = frame->time_base;
-
         tb.den <<= extra_bits;
         float_pts =
             av_rescale_q(frame->pts, filter_tb, tb) -
@@ -699,7 +700,6 @@  static double adjust_frame_pts_to_encoder_tb(OutputFile *of, OutputStream *ost,
             av_rescale_q(frame->pts, filter_tb, enc->time_base) -
             av_rescale_q(start_time, AV_TIME_BASE_Q, enc->time_base);
         frame->time_base = enc->time_base;
-    }
 
 early_exit: