[FFmpeg-cvslog] fftools/ffmpeg_filter: use a dedicated variable for marking simple filtergraphs

Anton Khirnov git at videolan.org
Wed May 31 17:25:42 EEST 2023


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun May 21 19:09:01 2023 +0200| [badf959ed6264ad4fce6e8e815e5dd9a5743c848] | committer: Anton Khirnov

fftools/ffmpeg_filter: use a dedicated variable for marking simple filtergraphs

Do not use an unrelated graph property, which will change in future
commits.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=badf959ed6264ad4fce6e8e815e5dd9a5743c848
---

 fftools/ffmpeg_filter.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index f37b867b31..e11ae2e9bf 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -41,6 +41,8 @@
 typedef struct FilterGraphPriv {
     FilterGraph fg;
 
+    int is_simple;
+
     const char *graph_desc;
 
     // frame for temporarily holding output from the filtergraph
@@ -353,6 +355,7 @@ FilterGraph *fg_create(char *graph_desc)
 int init_simple_filtergraph(InputStream *ist, OutputStream *ost)
 {
     FilterGraph *fg;
+    FilterGraphPriv *fgp;
     OutputFilter *ofilter;
     InputFilter  *ifilter;
     int ret;
@@ -360,6 +363,9 @@ int init_simple_filtergraph(InputStream *ist, OutputStream *ost)
     fg = fg_create(NULL);
     if (!fg)
         report_and_exit(AVERROR(ENOMEM));
+    fgp = fgp_from_fg(fg);
+
+    fgp->is_simple = 1;
 
     ofilter      = ofilter_alloc(fg);
     ofilter->ost = ost;
@@ -1474,7 +1480,7 @@ int ifilter_has_all_input_formats(FilterGraph *fg)
 int filtergraph_is_simple(FilterGraph *fg)
 {
     FilterGraphPriv *fgp = fgp_from_fg(fg);
-    return !fgp->graph_desc;
+    return fgp->is_simple;
 }
 
 int reap_filters(int flush)



More information about the ffmpeg-cvslog mailing list