summaryrefslogtreecommitdiff
path: root/ffserver_config.h
diff options
context:
space:
mode:
authorLukasz Marek <lukasz.m.luki2@gmail.com>2014-11-01 19:17:01 +0100
committerLukasz Marek <lukasz.m.luki2@gmail.com>2014-11-03 00:32:25 +0100
commit9c097f1cfc1825882353dc73e24a0d707d2495f2 (patch)
tree308a8ba20e26e09eca8cba1ea27806d28f06b669 /ffserver_config.h
parent2121e3e1306181acc39316639bb731919af5bab7 (diff)
downloadffmpeg-9c097f1cfc1825882353dc73e24a0d707d2495f2.tar.gz
ffserver_config: improve AVOption handing
AVOption are checked right after found in config file. It allows to report exact line in config file. Options provided more than once are threated as errors. It also fixes flag options handing. Flags may occur more than once in config file. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Diffstat (limited to 'ffserver_config.h')
-rw-r--r--ffserver_config.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/ffserver_config.h b/ffserver_config.h
index ac75b06892..6b64dc57cd 100644
--- a/ffserver_config.h
+++ b/ffserver_config.h
@@ -115,6 +115,7 @@ typedef struct FFServerConfig {
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);