Showing the changes to libavfilter/avfilter.c (1 of 3 files). Show all
Unified · Split
| @@ -322,6 +322,7 @@ int avfilter_config_links(AVFilterContext *filter) · 321 unmodified lines | |||
| 322 | for (i = 0; i < filter->nb_inputs; i ++) { | 322 | for (i = 0; i < filter->nb_inputs; i ++) { |
| 323 | AVFilterLink *link = filter->inputs[i]; | 323 | AVFilterLink *link = filter->inputs[i]; |
| 324 | AVFilterLink *inlink; | 324 | AVFilterLink *inlink; |
| 325 | FilterLinkInternal *li = ff_link_internal(link); | ||
| 325 | 326 | ||
| 326 | if (!link) continue; | 327 | if (!link) continue; |
| 327 | if (!link->src || !link->dst) { | 328 | if (!link->src || !link->dst) { |
| @@ -334,14 +335,14 @@ int avfilter_config_links(AVFilterContext *filter) · 6 unmodified lines | |||
| 334 | link->current_pts = | 335 | link->current_pts = |
| 335 | link->current_pts_us = AV_NOPTS_VALUE; | 336 | link->current_pts_us = AV_NOPTS_VALUE; |
| 336 | 337 | ||
| 337 | switch (link->init_state) { | 338 | switch (li->init_state) { |
| 338 | case AVLINK_INIT: | 339 | case AVLINK_INIT: |
| 339 | continue; | 340 | continue; |
| 340 | case AVLINK_STARTINIT: | 341 | case AVLINK_STARTINIT: |
| 341 | av_log(filter, AV_LOG_INFO, "circular filter chain detected\n"); | 342 | av_log(filter, AV_LOG_INFO, "circular filter chain detected\n"); |
| 342 | return 0; | 343 | return 0; |
| 343 | case AVLINK_UNINIT: | 344 | case AVLINK_UNINIT: |
| 344 | link->init_state = AVLINK_STARTINIT; | 345 | li->init_state = AVLINK_STARTINIT; |
| 345 | 346 | ||
| 346 | if ((ret = avfilter_config_links(link->src)) < 0) | 347 | if ((ret = avfilter_config_links(link->src)) < 0) |
| 347 | return ret; | 348 | return ret; |
| @@ -412,7 +413,7 @@ int avfilter_config_links(AVFilterContext *filter) · 64 unmodified lines | |||
| 412 | return ret; | 413 | return ret; |
| 413 | } | 414 | } |
| 414 | 415 | ||
| 415 | link->init_state = AVLINK_INIT; | 416 | li->init_state = AVLINK_INIT; |
| 416 | } | 417 | } |
| 417 | } | 418 | } |
| 418 | 419 | ||