virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/tee: use AV_OPT_TYPE_DICT for fifo_options

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2019-12-25 11:32:48 +01:00
parent 7c3125133f
commit 710e9f3f18
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/tee.c
View File

@@ -56,7 +56,6 @@ typedef struct TeeContext {
TeeSlave *slaves; TeeSlave *slaves;
int use_fifo; int use_fifo;
AVDictionary *fifo_options; AVDictionary *fifo_options;
char *fifo_options_str;
} TeeContext; } TeeContext;
static const char *const slave_delim = "|"; static const char *const slave_delim = "|";
@@ -67,8 +66,8 @@ static const char *const slave_select_sep = ",";
static const AVOption options[] = { static const AVOption options[] = {
{"use_fifo", "Use fifo pseudo-muxer to separate actual muxers from encoder", {"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}, 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), {"fifo_options", "fifo pseudo-muxer options", OFFSET(fifo_options),
AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM}, AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM},
{NULL} {NULL}
}; };
@@ -475,12 +474,6 @@ static int tee_write_header(AVFormatContext *avf)
filename++; 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)))) { if (!(tee->slaves = av_mallocz_array(nb_slaves, sizeof(*tee->slaves)))) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;