From a38e06c1aaac3002838e19612df375d42cc28a76 Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Mon, 10 Nov 2014 23:21:34 +0100 Subject: ffserver_config: handle codec private options This commit allows to set codec's private option. As side effect, it also improves preset support. Signed-off-by: Lukasz Marek --- ffserver_config.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'ffserver_config.h') diff --git a/ffserver_config.h b/ffserver_config.h index 6b64dc57cd..57deb5b271 100644 --- a/ffserver_config.h +++ b/ffserver_config.h @@ -107,15 +107,18 @@ 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); -- cgit v1.2.3