X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffserver_config.h;h=57deb5b271c2534d2e42ac87d737e68c1cc5c9dd;hb=a38e06c1aaac3002838e19612df375d42cc28a76;hp=36d61d0084fc2ec877252827202dedbb09fa78bb;hpb=77eff7a58a436e4b1c1adb54a12dd4f3cead28d2;p=ffmpeg diff --git a/ffserver_config.h b/ffserver_config.h index 36d61d0084f..57deb5b271c 100644 --- a/ffserver_config.h +++ b/ffserver_config.h @@ -107,11 +107,18 @@ 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; - + 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_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);