Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
710e9f3f
Commit
710e9f3f
authored
Dec 25, 2019
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/tee: use AV_OPT_TYPE_DICT for fifo_options
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
7c312513
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
9 deletions
+2
-9
tee.c
libavformat/tee.c
+2
-9
No files found.
libavformat/tee.c
View file @
710e9f3f
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment