X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffserver_config.h;h=06981de7465bc53eea5e3b2edc79aebc8f5ed2bc;hb=8ef46f4a0cd3019b1099de424db28954f2c4ad59;hp=6b64dc57cd107e1c5f4c0be677f69407df38cd6d;hpb=04f6a5230db8e3f86ec7137f87eb68c8b3ce9959;p=ffmpeg diff --git a/ffserver_config.h b/ffserver_config.h index 6b64dc57cd1..06981de7465 100644 --- a/ffserver_config.h +++ b/ffserver_config.h @@ -107,15 +107,16 @@ typedef struct FFServerConfig { int errors; int warnings; // 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; } FFServerConfig; void ffserver_get_arg(char *buf, int buf_size, const char **pp);