libavutil/threads.h: correct an include to be local

[ffmpeg] / ffserver_config.h

diff --git a/ffserver_config.h b/ffserver_config.h
index 6b64dc57cd107e1c5f4c0be677f69407df38cd6d..bdeb3c990afaf0b7698955f021b40633bc4e3ba0 100644 (file)
--- a/ffserver_config.h
+++ b/ffserver_config.h
@@ -106,16 +106,18 @@ typedef struct FFServerConfig {
     struct sockaddr_in rtsp_addr;
     int errors;
     int warnings;
+    int use_defaults;
     // Following variables MUST NOT be used outside configuration parsing code.
-    enum AVCodecID audio_id;
-    enum AVCodecID video_id;
+    enum AVCodecID guessed_audio_codec_id;
+    enum AVCodecID guessed_video_codec_id;
     AVDictionary *video_opts;     /* AVOptions for video encoder */
-    AVDictionary *video_conf;     /* Values stored in video AVCodecContext.fields */
     AVDictionary *audio_opts;     /* AVOptions for audio encoder */
-    AVDictionary *audio_conf;     /* Values stored in audio AVCodecContext.fields */
-    char *video_preset;
-    char *audio_preset;
-    AVCodecContext *dummy_ctx;    /* Used internally to test AVOptions. Not to be used anywhere else */
+    AVCodecContext *dummy_actx;   /* Used internally to test audio AVOptions. */
+    AVCodecContext *dummy_vctx;   /* Used internally to test video AVOptions. */
+    int no_audio;
+    int no_video;
+    int line_num;
+    int stream_use_defaults;
 } FFServerConfig;
 
 void ffserver_get_arg(char *buf, int buf_size, const char **pp);
@@ -126,4 +128,6 @@ void ffserver_parse_acl_row(FFServerStream *stream, FFServerStream* feed,
 
 int ffserver_parse_ffconfig(const char *filename, FFServerConfig *config);
 
+void ffserver_free_child_args(void *argsp);
+
 #endif /* FFSERVER_CONFIG_H */