RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  lavfi: filtfmts: use newer avfilter APIs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-20 10:48:15 +02:00
parent 4835332537 6756d98cec
commit b67401797e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/filtfmts.c
View File

@ -69,6 +69,7 @@ int main(int argc, char **argv)
{ {
AVFilter *filter; AVFilter *filter;
AVFilterContext *filter_ctx; AVFilterContext *filter_ctx;
AVFilterGraph *graph_ctx;
const char *filter_name; const char *filter_name;
const char *filter_args = NULL; const char *filter_args = NULL;
int i; int i;
@ -84,6 +85,11 @@ int main(int argc, char **argv)
if (argc > 2) if (argc > 2)
filter_args = argv[2]; filter_args = argv[2];
/* allocate graph */
graph_ctx = avfilter_graph_alloc();
if (!graph_ctx)
return 1;
avfilter_register_all(); avfilter_register_all();
/* get a corresponding filter and open it */ /* get a corresponding filter and open it */
@ -92,7 +98,8 @@ int main(int argc, char **argv)
return 1; 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", fprintf(stderr, "Impossible to open filter with name '%s'\n",
filter_name); filter_name);
return 1; return 1;
@ -123,6 +130,7 @@ int main(int argc, char **argv)
print_formats(filter_ctx); print_formats(filter_ctx);
avfilter_free(filter_ctx); avfilter_free(filter_ctx);
avfilter_graph_free(&graph_ctx);
fflush(stdout); fflush(stdout);
return 0; return 0;
} }