To do this, allocate AVFilterGraphInternal jointly with AVFilterGraph and rename it to FFFilterGraph in the process (similarly to AVStream/FFStream). The AVFilterGraphInternal* will be removed on the next major version bump.
Showing the changes to libavfilter/avfilter.c (1 of 4 files). Show all
Unified · Split
| @@ -187,7 +187,7 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, · 186 unmodified lines | |||
| 187 | av_assert0(AV_PIX_FMT_NONE == -1 && AV_SAMPLE_FMT_NONE == -1); | 187 | av_assert0(AV_PIX_FMT_NONE == -1 && AV_SAMPLE_FMT_NONE == -1); |
| 188 | link->format = -1; | 188 | link->format = -1; |
| 189 | link->colorspace = AVCOL_SPC_UNSPECIFIED; | 189 | link->colorspace = AVCOL_SPC_UNSPECIFIED; |
| 190 | ff_framequeue_init(&li->fifo, &src->graph->internal->frame_queues); | 190 | ff_framequeue_init(&li->fifo, &fffiltergraph(src->graph)->frame_queues); |
| 191 | 191 | ||
| 192 | return 0; | 192 | return 0; |
| 193 | } | 193 | } |
| @@ -904,9 +904,9 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options) · 710 unmodified lines | |||
| 904 | 904 | ||
| 905 | if (ctx->filter->flags & AVFILTER_FLAG_SLICE_THREADS && | 905 | if (ctx->filter->flags & AVFILTER_FLAG_SLICE_THREADS && |
| 906 | ctx->thread_type & ctx->graph->thread_type & AVFILTER_THREAD_SLICE && | 906 | ctx->thread_type & ctx->graph->thread_type & AVFILTER_THREAD_SLICE && |
| 907 | ctx->graph->internal->thread_execute) { | 907 | fffiltergraph(ctx->graph)->thread_execute) { |
| 908 | ctx->thread_type = AVFILTER_THREAD_SLICE; | 908 | ctx->thread_type = AVFILTER_THREAD_SLICE; |
| 909 | ctxi->execute = ctx->graph->internal->thread_execute; | 909 | ctxi->execute = fffiltergraph(ctx->graph)->thread_execute; |
| 910 | } else { | 910 | } else { |
| 911 | ctx->thread_type = 0; | 911 | ctx->thread_type = 0; |
| 912 | } | 912 | } |