lavf/http: deprecate user-agent option

[ffmpeg] / libavfilter / avfilter.h

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 79227a7ea0a77a79ad7e46050dcf988bdb106a91..15d00f70586f68ce079e97bdd9bbe24d6b548f4a 100644 (file)
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -29,7 +29,9 @@
  */
 
 /**
- * @defgroup lavfi Libavfilter - graph-based frame editing library
+ * @defgroup lavfi libavfilter
+ * Graph-based frame editing library.
+ *
  * @{
  */
 
@@ -344,6 +346,13 @@ struct AVFilterContext {
      */
     AVFilterInternal *internal;
 
+    struct AVFilterCommand *command_queue;
+
+    char *enable_str;               ///< enable expression string
+    void *enable;                   ///< parsed expression (AVExpr*)
+    double *var_values;             ///< variable values for the enable expression
+    int is_disabled;                ///< the enabled state from the last expression evaluation
+
     /**
      * For filters which will create hardware frames, sets the device the
      * filter should create them in.  All other filters will ignore this field:
@@ -353,12 +362,12 @@ struct AVFilterContext {
      */
     AVBufferRef *hw_device_ctx;
 
-    struct AVFilterCommand *command_queue;
-
-    char *enable_str;               ///< enable expression string
-    void *enable;                   ///< parsed expression (AVExpr*)
-    double *var_values;             ///< variable values for the enable expression
-    int is_disabled;                ///< the enabled state from the last expression evaluation
+    /**
+     * Max number of threads allowed in this filter instance.
+     * If <= 0, its value is ignored.
+     * Overrides global number of threads set per filter graph.
+     */
+    int nb_threads;
 };
 
 /**
@@ -473,12 +482,6 @@ struct AVFilterLink {
      */
     AVRational frame_rate;
 
-    /**
-     * For hwaccel pixel formats, this should be a reference to the
-     * AVHWFramesContext describing the frames.
-     */
-    AVBufferRef *hw_frames_ctx;
-
     /**
      * Buffer partially filled with samples to achieve a fixed/minimum size.
      */
@@ -550,6 +553,12 @@ struct AVFilterLink {
      * cleared when a frame is filtered.
      */
     int frame_wanted_out;
+
+    /**
+     * For hwaccel pixel formats, this should be a reference to the
+     * AVHWFramesContext describing the frames.
+     */
+    AVBufferRef *hw_frames_ctx;
 };
 
 /**