ffmpeg | branch: master | Marton Balint <c...@passwd.hu> | Wed Dec 25 11:32:48 2019 +0100| [710e9f3f185a65975a1b1bf6f7a66a0da124671a] | committer: Marton Balint
avformat/tee: use AV_OPT_TYPE_DICT for fifo_options Signed-off-by: Marton Balint <c...@passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=710e9f3f185a65975a1b1bf6f7a66a0da124671a --- libavformat/tee.c | 11 ++--------- 1 file 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
