Unified · Split
| @@ -112,6 +112,7 @@ static const AVOption graphmonitor_options[] = { · 111 unmodified lines | |||
| 112 | { "f", "set flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64=FLAG_QUEUE}, 0, INT_MAX, VFR, "flags" }, | 112 | { "f", "set flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64=FLAG_QUEUE}, 0, INT_MAX, VFR, "flags" }, |
| 113 | { "none", NULL, 0, AV_OPT_TYPE_CONST, {.i64=FLAG_NONE}, 0, 0, VFR, "flags" }, | 113 | { "none", NULL, 0, AV_OPT_TYPE_CONST, {.i64=FLAG_NONE}, 0, 0, VFR, "flags" }, |
| 114 | { "all", NULL, 0, AV_OPT_TYPE_CONST, {.i64=INT_MAX}, 0, 0, VFR, "flags" }, | 114 | { "all", NULL, 0, AV_OPT_TYPE_CONST, {.i64=INT_MAX}, 0, 0, VFR, "flags" }, |
| 115 | { "queue", NULL, 0, AV_OPT_TYPE_CONST, {.i64=FLAG_QUEUE}, 0, 0, VFR, "flags" }, | ||
| 115 | { "frame_count_in", NULL, 0, AV_OPT_TYPE_CONST, {.i64=FLAG_FCOUT}, 0, 0, VFR, "flags" }, | 116 | { "frame_count_in", NULL, 0, AV_OPT_TYPE_CONST, {.i64=FLAG_FCOUT}, 0, 0, VFR, "flags" }, |
| 116 | { "frame_count_out", NULL, 0, AV_OPT_TYPE_CONST, {.i64=FLAG_FCIN}, 0, 0, VFR, "flags" }, | 117 | { "frame_count_out", NULL, 0, AV_OPT_TYPE_CONST, {.i64=FLAG_FCIN}, 0, 0, VFR, "flags" }, |
| 117 | { "frame_count_delta",NULL, 0, AV_OPT_TYPE_CONST, {.i64=FLAG_FC_DELTA},0, 0, VFR, "flags" }, | 118 | { "frame_count_delta",NULL, 0, AV_OPT_TYPE_CONST, {.i64=FLAG_FC_DELTA},0, 0, VFR, "flags" }, |
| @@ -384,8 +385,9 @@ static int create_frame(AVFilterContext *ctx, int64_t pts) · 266 unmodified lines | |||
| 384 | { | 385 | { |
| 385 | GraphMonitorContext *s = ctx->priv; | 386 | GraphMonitorContext *s = ctx->priv; |
| 386 | AVFilterLink *outlink = ctx->outputs[0]; | 387 | AVFilterLink *outlink = ctx->outputs[0]; |
| 387 | AVFrame *out; | ||
| 388 | int ret, len, xpos, ypos = 0; | 388 | int ret, len, xpos, ypos = 0; |
| 389 | char buffer[1024]; | ||
| 390 | AVFrame *out; | ||
| 389 | 391 | ||
| 390 | out = ff_get_video_buffer(outlink, outlink->w, outlink->h); | 392 | out = ff_get_video_buffer(outlink, outlink->w, outlink->h); |
| 391 | if (!out) | 393 | if (!out) |
| @@ -397,7 +399,6 @@ static int create_frame(AVFilterContext *ctx, int64_t pts) · 5 unmodified lines | |||
| 397 | 399 | ||
| 398 | for (int i = 0; i < ctx->graph->nb_filters; i++) { | 400 | for (int i = 0; i < ctx->graph->nb_filters; i++) { |
| 399 | AVFilterContext *filter = ctx->graph->filters[i]; | 401 | AVFilterContext *filter = ctx->graph->filters[i]; |
| 400 | char buffer[1024] = { 0 }; | ||
| 401 | 402 | ||
| 402 | if ((s->mode & MODE_COMPACT) && !filter_have_queued(filter)) | 403 | if ((s->mode & MODE_COMPACT) && !filter_have_queued(filter)) |
| 403 | continue; | 404 | continue; |