X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavfilter%2Ffiltfmts.c;h=cc046542223ffb66063bf20577e5aa92f34fe52b;hp=424811adfec143f90f8fa7ac2f59538929440a7a;hb=88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08;hpb=b01f6041f4260fba053c2f96ce1611ea77e833a0 diff --git a/libavfilter/filtfmts.c b/libavfilter/filtfmts.c index 424811adfe..cc04654222 100644 --- a/libavfilter/filtfmts.c +++ b/libavfilter/filtfmts.c @@ -20,8 +20,9 @@ #include -#include "libavformat/avformat.h" +#include "libavutil/mem.h" #include "libavutil/pixdesc.h" + #include "libavfilter/avfilter.h" #include "libavfilter/formats.h" @@ -29,9 +30,10 @@ int main(int argc, char **argv) { AVFilter *filter; AVFilterContext *filter_ctx; + AVFilterGraph *graph_ctx; const char *filter_name; const char *filter_args = NULL; - int i, j; + int i, j, ret = 0; av_log_set_level(AV_LOG_DEBUG); @@ -44,6 +46,11 @@ int main(int argc, char **argv) if (argv[2]) filter_args = argv[2]; + /* allocate graph */ + graph_ctx = avfilter_graph_alloc(); + if (!graph_ctx) + return 1; + avfilter_register_all(); /* get a corresponding filter and open it */ @@ -52,7 +59,8 @@ int main(int argc, char **argv) return 1; } - if (avfilter_open(&filter_ctx, filter, NULL) < 0) { + /* open filter and add it to the graph */ + if (!(filter_ctx = avfilter_graph_alloc_filter(graph_ctx, filter, filter_name))) { fprintf(stderr, "Impossible to open filter with name '%s'\n", filter_name); return 1; @@ -64,14 +72,24 @@ int main(int argc, char **argv) } /* create a link for each of the input pads */ - for (i = 0; i < filter_ctx->input_count; i++) { + for (i = 0; i < filter_ctx->nb_inputs; i++) { AVFilterLink *link = av_mallocz(sizeof(AVFilterLink)); - link->type = filter_ctx->filter->inputs[i].type; + if (!link) { + fprintf(stderr, "Unable to allocate memory for filter input link\n"); + ret = 1; + goto fail; + } + link->type = avfilter_pad_get_type(filter_ctx->filter->inputs, i); filter_ctx->inputs[i] = link; } - for (i = 0; i < filter_ctx->output_count; i++) { + for (i = 0; i < filter_ctx->nb_outputs; i++) { AVFilterLink *link = av_mallocz(sizeof(AVFilterLink)); - link->type = filter_ctx->filter->outputs[i].type; + if (!link) { + fprintf(stderr, "Unable to allocate memory for filter output link\n"); + ret = 1; + goto fail; + } + link->type = avfilter_pad_get_type(filter_ctx->filter->outputs, i); filter_ctx->outputs[i] = link; } @@ -81,24 +99,26 @@ int main(int argc, char **argv) ff_default_query_formats(filter_ctx); /* print the supported formats in input */ - for (i = 0; i < filter_ctx->input_count; i++) { + for (i = 0; i < filter_ctx->nb_inputs; i++) { AVFilterFormats *fmts = filter_ctx->inputs[i]->out_formats; for (j = 0; j < fmts->nb_formats; j++) printf("INPUT[%d] %s: %s\n", - i, filter_ctx->filter->inputs[i].name, + i, avfilter_pad_get_name(filter_ctx->filter->inputs, i), av_get_pix_fmt_name(fmts->formats[j])); } /* print the supported formats in output */ - for (i = 0; i < filter_ctx->output_count; i++) { + for (i = 0; i < filter_ctx->nb_outputs; i++) { AVFilterFormats *fmts = filter_ctx->outputs[i]->in_formats; for (j = 0; j < fmts->nb_formats; j++) printf("OUTPUT[%d] %s: %s\n", - i, filter_ctx->filter->outputs[i].name, + i, avfilter_pad_get_name(filter_ctx->filter->outputs, i), av_get_pix_fmt_name(fmts->formats[j])); } +fail: avfilter_free(filter_ctx); + avfilter_graph_free(&graph_ctx); fflush(stdout); - return 0; + return ret; }