fftools/ffmpeg_filter: make InputFilterPriv and OutputFilterPriv private again

As the names imply, they are structs meant to be internal and private to the
filter handling code. If a field is required in other modules, then it can
be moved to the public facing structs, which is done in this commit.

Signed-off-by: James Almer <jamrial@gmail.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/fftools/graph/graphprint.c b/fftools/graph/graphprint.c
index e55c8d7507..423878326d 100644
--- a/fftools/graph/graphprint.c
+++ b/fftools/graph/graphprint.c
@@ -28,7 +28,7 @@
 
 #include "graphprint.h"
 
-#include "fftools/ffmpeg_filter.h"
+#include "fftools/ffmpeg.h"
 #include "fftools/ffmpeg_mux.h"
 
 #include "libavutil/avassert.h"
@@ -490,7 +490,7 @@ static void print_filtergraph_single(GraphPrintContext *gpc, FilterGraph *fg, AV
     print_section_header_id(gpc, SECTION_ID_GRAPH_INPUTS, "Input_File", 0);
 
     for (int i = 0; i < fg->nb_inputs; i++) {
-        InputFilterPriv *ifilter = ifp_from_ifilter(fg->inputs[i]);
+        InputFilter *ifilter = fg->inputs[i];
         enum AVMediaType media_type = ifilter->type;
 
         avtext_print_section_header(tfc, NULL, SECTION_ID_GRAPH_INPUT);
@@ -507,8 +507,8 @@ static void print_filtergraph_single(GraphPrintContext *gpc, FilterGraph *fg, AV
 
         if (ifilter->linklabel && ifilter->filter)
             av_dict_set(&input_map, ifilter->filter->name, (const char *)ifilter->linklabel, 0);
-        else if (ifilter->opts.name && ifilter->filter)
-            av_dict_set(&input_map, ifilter->filter->name, (const char *)ifilter->opts.name, 0);
+        else if (ifilter->input_name && ifilter->filter)
+            av_dict_set(&input_map, ifilter->filter->name, (const char *)ifilter->input_name, 0);
 
         print_str("media_type", av_get_media_type_string(media_type));
 
@@ -520,13 +520,13 @@ static void print_filtergraph_single(GraphPrintContext *gpc, FilterGraph *fg, AV
     print_section_header_id(gpc, SECTION_ID_GRAPH_OUTPUTS, "Output_File", 0);
 
     for (int i = 0; i < fg->nb_outputs; i++) {
-        OutputFilterPriv *ofilter = ofp_from_ofilter(fg->outputs[i]);
+        OutputFilter *ofilter = fg->outputs[i];
 
         avtext_print_section_header(tfc, NULL, SECTION_ID_GRAPH_OUTPUT);
 
         print_int("output_index", ofilter->index);
 
-        print_str("name", ofilter->name);
+        print_str("name", ofilter->output_name);
 
         if (fg->outputs[i]->linklabel)
             print_str("link_label", (const char*)fg->outputs[i]->linklabel);
@@ -536,11 +536,11 @@ static void print_filtergraph_single(GraphPrintContext *gpc, FilterGraph *fg, AV
             print_str("filter_name", ofilter->filter->filter->name);
         }
 
-        if (ofilter->name && ofilter->filter)
-            av_dict_set(&output_map, ofilter->filter->name, ofilter->name, 0);
+        if (ofilter->output_name && ofilter->filter)
+            av_dict_set(&output_map, ofilter->filter->name, ofilter->output_name, 0);
 
 
-        print_str("media_type", av_get_media_type_string(fg->outputs[i]->type));
+        print_str("media_type", av_get_media_type_string(ofilter->type));
 
         avtext_print_section_footer(tfc); // SECTION_ID_GRAPH_OUTPUT
     }