Originally committed as revision 12713 to svn://svn.ffmpeg.org/ffmpeg/trunk
Showing the changes to libavfilter/avfiltergraph.c (1 of 1 file). Show all
Unified · Split
| @@ -492,7 +492,8 @@ int avfilter_graph_config_links(AVFilterContext *graphctx) · 491 unmodified lines | |||
| 492 | return 0; | 492 | return 0; |
| 493 | } | 493 | } |
| 494 | 494 | ||
| 495 | static AVFilterContext *create_filter_with_args(const char *filt, void *opaque) | 495 | static AVFilterContext *create_filter_with_args(AVFilterContext *graphctx, |
| 496 | const char *filt, void *opaque) | ||
| 496 | { | 497 | { |
| 497 | AVFilterContext *ret; | 498 | AVFilterContext *ret; |
| 498 | char *filter = av_strdup(filt); /* copy - don't mangle the input string */ | 499 | char *filter = av_strdup(filt); /* copy - don't mangle the input string */ |
| @@ -507,17 +508,17 @@ static AVFilterContext *create_filter_with_args(const char *filt, void *opaque) · 8 unmodified lines | |||
| 507 | *args ++ = 0; | 508 | *args ++ = 0; |
| 508 | } | 509 | } |
| 509 | 510 | ||
| 510 | av_log(NULL, AV_LOG_INFO, "creating filter \"%s\" with args \"%s\"\n", | 511 | av_log(graphctx, AV_LOG_INFO, "creating filter \"%s\" with args \"%s\"\n", |
| 511 | name, args ? args : "(none)"); | 512 | name, args ? args : "(none)"); |
| 512 | 513 | ||
| 513 | if((ret = avfilter_open(avfilter_get_by_name(name), NULL))) { | 514 | if((ret = avfilter_open(avfilter_get_by_name(name), NULL))) { |
| 514 | if(avfilter_init_filter(ret, args, opaque)) { | 515 | if(avfilter_init_filter(ret, args, opaque)) { |
| 515 | av_log(NULL, AV_LOG_ERROR, "error initializing filter!\n"); | 516 | av_log(graphctx, AV_LOG_ERROR, "error initializing filter!\n"); |
| 516 | avfilter_destroy(ret); | 517 | avfilter_destroy(ret); |
| 517 | goto fail; | 518 | goto fail; |
| 518 | } | 519 | } |
| 519 | } else { | 520 | } else { |
| 520 | av_log(NULL, AV_LOG_ERROR, | 521 | av_log(graphctx, AV_LOG_ERROR, |
| 521 | "error creating filter \"%s\" with args \"%s\"\n", | 522 | "error creating filter \"%s\" with args \"%s\"\n", |
| 522 | name, args ? args : "(none)"); | 523 | name, args ? args : "(none)"); |
| 523 | } | 524 | } |
| @@ -544,13 +545,13 @@ static int graph_load_chain(AVFilterContext *graphctx, · 20 unmodified lines | |||
| 544 | if(opaque) op = opaque[i]; | 545 | if(opaque) op = opaque[i]; |
| 545 | else op = NULL; | 546 | else op = NULL; |
| 546 | 547 | ||
| 547 | if(!(filters[1] = create_filter_with_args(filter_list[i], op))) | 548 | if(!(filters[1] = create_filter_with_args(graphctx, filter_list[i], op))) |
| 548 | goto fail; | 549 | goto fail; |
| 549 | if(i == 0) { | 550 | if(i == 0) { |
| 550 | if(first) *first = filters[1]; | 551 | if(first) *first = filters[1]; |
| 551 | } else { | 552 | } else { |
| 552 | if(avfilter_link(filters[0], 0, filters[1], 0)) { | 553 | if(avfilter_link(filters[0], 0, filters[1], 0)) { |
| 553 | av_log(NULL, AV_LOG_ERROR, "error linking filters!\n"); | 554 | av_log(graphctx, AV_LOG_ERROR, "error linking filters!\n"); |
| 554 | goto fail; | 555 | goto fail; |
| 555 | } | 556 | } |
| 556 | } | 557 | } |