eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-04-21 11:54:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

avfiltergraph: make the AVFilterInOut alloc/free API public

Browse Source 
This is required for letting applications to create and destroy
AVFilterInOut structs in a convenient way.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Stefano Sabatini
2011-06-11 15:30:46 +02:00
committed by Anton Khirnov
parent 12e7e1d03e
commit 91d3cbe0fd
6 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libavfilter/graphparser.c
View File

@@ -170,13 +170,18 @@ static int parse_filter(AVFilterContext **filt_ctx, const char **buf, AVFilterGr
return ret;
}
static void free_inout(AVFilterInOut *head)
AVFilterInOut *avfilter_inout_alloc(void)
{
while (head) {
AVFilterInOut *next = head->next;
av_free(head->name);
av_free(head);
head = next;
return av_mallocz(sizeof(AVFilterInOut));
}
void avfilter_inout_free(AVFilterInOut **inout)
{
while (*inout) {
AVFilterInOut *next = (*inout)->next;
av_freep(&(*inout)->name);
av_freep(inout);
*inout = next;
}
}
@@ -431,9 +436,9 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
for (; graph->filter_count > 0; graph->filter_count--)
avfilter_free(graph->filters[graph->filter_count - 1]);
av_freep(&graph->filters);
free_inout(open_inputs);
free_inout(open_outputs);
free_inout(curr_inputs);
avfilter_inout_free(&open_inputs);
avfilter_inout_free(&open_outputs);
avfilter_inout_free(&curr_inputs);
*inputs = NULL;
*outputs = NULL;
@@ -467,7 +472,7 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
continue;
ret = avfilter_link(match->filter_ctx, match->pad_idx,
cur->filter_ctx, cur->pad_idx);
free_inout(match);
avfilter_inout_free(&match);
if (ret < 0)
goto fail;
}
@@ -487,7 +492,7 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
continue;
ret = avfilter_link(cur->filter_ctx, cur->pad_idx,
match->filter_ctx, match->pad_idx);
free_inout(match);
avfilter_inout_free(&match);
if (ret < 0)
goto fail;
}
@@ -498,9 +503,9 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
avfilter_free(graph->filters[graph->filter_count - 1]);
av_freep(&graph->filters);
}
free_inout(inputs);
free_inout(outputs);
free_inout(open_inputs);
free_inout(open_outputs);
avfilter_inout_free(&inputs);
avfilter_inout_free(&outputs);
avfilter_inout_free(&open_inputs);
avfilter_inout_free(&open_outputs);
return ret;
}