lavc/parser: export field order if not already set

[ffmpeg] / libavfilter / vf_curves.c

diff --git a/libavfilter/vf_curves.c b/libavfilter/vf_curves.c
index e39bb49339dd4f91a220aae28942db0726992d45..69ec1084bb3e0933bda9ed3128897bb32fc10502 100644 (file)
--- a/libavfilter/vf_curves.c
+++ b/libavfilter/vf_curves.c
@@ -334,8 +334,8 @@ end:
 }
 
 #define DECLARE_INTERPOLATE_FUNC(nbits)                                     \
-static const int interpolate##nbits(void *log_ctx, uint16_t *y,             \
-                                    const struct keypoint *points)          \
+static int interpolate##nbits(void *log_ctx, uint16_t *y,                   \
+                              const struct keypoint *points)                \
 {                                                                           \
     return interpolate(log_ctx, y, points, nbits);                          \
 }
@@ -460,7 +460,7 @@ static int dump_curves(const char *fname, uint16_t *graph[NB_COMP + 1],
     return 0;
 }
 
-static av_cold int init(AVFilterContext *ctx)
+static av_cold int curves_init(AVFilterContext *ctx)
 {
     int i, ret;
     CurvesContext *curves = ctx->priv;
@@ -647,7 +647,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 
     td.in  = in;
     td.out = out;
-    ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outlink->h, ctx->graph->nb_threads));
+    ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outlink->h, ff_filter_get_nb_threads(ctx)));
 
     if (out != in)
         av_frame_free(&in);
@@ -655,7 +655,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
     return ff_filter_frame(outlink, out);
 }
 
-static av_cold void uninit(AVFilterContext *ctx)
+static av_cold void curves_uninit(AVFilterContext *ctx)
 {
     int i;
     CurvesContext *curves = ctx->priv;
@@ -686,8 +686,8 @@ AVFilter ff_vf_curves = {
     .name          = "curves",
     .description   = NULL_IF_CONFIG_SMALL("Adjust components curves."),
     .priv_size     = sizeof(CurvesContext),
-    .init          = init,
-    .uninit        = uninit,
+    .init          = curves_init,
+    .uninit        = curves_uninit,
     .query_formats = query_formats,
     .inputs        = curves_inputs,
     .outputs       = curves_outputs,