Merge commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118'

[ffmpeg] / ffserver_config.h

diff --git a/ffserver_config.h b/ffserver_config.h
index 36d61d0084fc2ec877252827202dedbb09fa78bb..6b64dc57cd107e1c5f4c0be677f69407df38cd6d 100644 (file)
--- a/ffserver_config.h
+++ b/ffserver_config.h
@@ -107,11 +107,15 @@ typedef struct FFServerConfig {
     int errors;
     int warnings;
     // Following variables MUST NOT be used outside configuration parsing code.
-    AVCodecContext audio_enc;
-    AVCodecContext video_enc;
     enum AVCodecID audio_id;
     enum AVCodecID video_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 */
 } FFServerConfig;
 
 void ffserver_get_arg(char *buf, int buf_size, const char **pp);