diff mbox series

[FFmpeg-devel,5/6] fftools/ffmpeg: drop OutputStream.fps_mode

Message ID 20220825085956.4790-5-anton@khirnov.net
State Accepted
Commit 0dd7347963041667e07366c83460fda8f19f4037
Headers show
Series [FFmpeg-devel,1/6] fftools/ffmpeg: remove a stale extern declaration | expand

Commit Message

Anton Khirnov Aug. 25, 2022, 8:59 a.m. UTC 
It is only used within new_video_stream(), so make it a local variable
there.
---
 fftools/ffmpeg.h     | 1 -
 fftools/ffmpeg_opt.c | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 68f24bd1d3..481b836d30 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -522,7 +522,6 @@  typedef struct OutputStream {
     AVRational max_frame_rate;
     enum VideoSyncMethod vsync_method;
     int is_cfr;
-    const char *fps_mode;
     int force_fps;
     int top_field_first;
     int rotate_overridden;
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index 1659cf55ba..e8669afa12 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -1875,7 +1875,7 @@  static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
 
     if (ost->enc_ctx) {
         AVCodecContext *video_enc = ost->enc_ctx;
-        const char *p = NULL;
+        const char *p = NULL, *fps_mode = NULL;
         char *frame_size = NULL;
         char *frame_pix_fmt = NULL;
         char *intra_matrix = NULL, *inter_matrix = NULL;
@@ -2027,9 +2027,9 @@  static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
         MATCH_PER_STREAM_OPT(top_field_first, i, ost->top_field_first, oc, st);
 
         ost->vsync_method = video_sync_method;
-        MATCH_PER_STREAM_OPT(fps_mode, str, ost->fps_mode, oc, st);
-        if (ost->fps_mode)
-            parse_and_set_vsync(ost->fps_mode, &ost->vsync_method, ost->file_index, ost->index, 0);
+        MATCH_PER_STREAM_OPT(fps_mode, str, fps_mode, oc, st);
+        if (fps_mode)
+            parse_and_set_vsync(fps_mode, &ost->vsync_method, ost->file_index, ost->index, 0);
 
         if (ost->vsync_method == VSYNC_AUTO) {
             if (!strcmp(oc->oformat->name, "avi")) {