diff options
author | Marton Balint <cus@passwd.hu> | 2019-12-25 11:32:48 +0100 |
---|---|---|
committer | Marton Balint <cus@passwd.hu> | 2020-01-01 20:41:34 +0100 |
commit | 710e9f3f185a65975a1b1bf6f7a66a0da124671a (patch) | |
tree | f526405cb74b2bd936abaf510639c284341ea5a1 /libavformat | |
parent | 7c3125133f79db26e76c3888dba2ee78170483e4 (diff) | |
download | ffmpeg-710e9f3f185a65975a1b1bf6f7a66a0da124671a.tar.gz |
avformat/tee: use AV_OPT_TYPE_DICT for fifo_options
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/tee.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libavformat/tee.c b/libavformat/tee.c index d91993354b..56669d9d8e 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -56,7 +56,6 @@ typedef struct TeeContext { TeeSlave *slaves; int use_fifo; AVDictionary *fifo_options; - char *fifo_options_str; } TeeContext; static const char *const slave_delim = "|"; @@ -67,8 +66,8 @@ static const char *const slave_select_sep = ","; static const AVOption options[] = { {"use_fifo", "Use fifo pseudo-muxer to separate actual muxers from encoder", OFFSET(use_fifo), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, - {"fifo_options", "fifo pseudo-muxer options", OFFSET(fifo_options_str), - AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM}, + {"fifo_options", "fifo pseudo-muxer options", OFFSET(fifo_options), + AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM}, {NULL} }; @@ -475,12 +474,6 @@ static int tee_write_header(AVFormatContext *avf) filename++; } - if (tee->fifo_options_str) { - ret = av_dict_parse_string(&tee->fifo_options, tee->fifo_options_str, "=", ":", 0); - if (ret < 0) - goto fail; - } - if (!(tee->slaves = av_mallocz_array(nb_slaves, sizeof(*tee->slaves)))) { ret = AVERROR(ENOMEM); goto fail; |