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
71a2e524
Commit
71a2e524
authored
Jul 05, 2013
by
Stefano Sabatini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/segment: use AV_OPT_TIME_DURATION for time_delta
Simplify.
parent
459dc81a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
11 deletions
+1
-11
segment.c
libavformat/segment.c
+1
-11
No files found.
libavformat/segment.c
View file @
71a2e524
...
@@ -86,7 +86,6 @@ typedef struct {
...
@@ -86,7 +86,6 @@ typedef struct {
int
nb_frames
;
///< number of elments in the frames array
int
nb_frames
;
///< number of elments in the frames array
int
frame_count
;
int
frame_count
;
char
*
time_delta_str
;
///< approximation value duration used for the segment times
int64_t
time_delta
;
int64_t
time_delta
;
int
individual_header_trailer
;
/**< Set by a private option. */
int
individual_header_trailer
;
/**< Set by a private option. */
int
write_header_trailer
;
/**< Set by a private option. */
int
write_header_trailer
;
/**< Set by a private option. */
...
@@ -556,15 +555,6 @@ static int seg_write_header(AVFormatContext *s)
...
@@ -556,15 +555,6 @@ static int seg_write_header(AVFormatContext *s)
}
}
}
}
if
(
seg
->
time_delta_str
)
{
if
((
ret
=
av_parse_time
(
&
seg
->
time_delta
,
seg
->
time_delta_str
,
1
))
<
0
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Invalid time duration specification '%s' for delta option
\n
"
,
seg
->
time_delta_str
);
return
ret
;
}
}
if
(
seg
->
list
)
{
if
(
seg
->
list
)
{
if
(
seg
->
list_type
==
LIST_TYPE_UNDEFINED
)
{
if
(
seg
->
list_type
==
LIST_TYPE_UNDEFINED
)
{
if
(
av_match_ext
(
seg
->
list
,
"csv"
))
seg
->
list_type
=
LIST_TYPE_CSV
;
if
(
av_match_ext
(
seg
->
list
,
"csv"
))
seg
->
list_type
=
LIST_TYPE_CSV
;
...
@@ -786,7 +776,7 @@ static const AVOption options[] = {
...
@@ -786,7 +776,7 @@ static const AVOption options[] = {
{
"hls"
,
"Apple HTTP Live Streaming compatible"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
LIST_TYPE_M3U8
},
INT_MIN
,
INT_MAX
,
E
,
"list_type"
},
{
"hls"
,
"Apple HTTP Live Streaming compatible"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
LIST_TYPE_M3U8
},
INT_MIN
,
INT_MAX
,
E
,
"list_type"
},
{
"segment_time"
,
"set segment duration"
,
OFFSET
(
time_str
),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
0
,
0
,
E
},
{
"segment_time"
,
"set segment duration"
,
OFFSET
(
time_str
),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
0
,
0
,
E
},
{
"segment_time_delta"
,
"set approximation value used for the segment times"
,
OFFSET
(
time_delta
_str
),
AV_OPT_TYPE_STRING
,
{.
str
=
"0"
},
0
,
0
,
E
},
{
"segment_time_delta"
,
"set approximation value used for the segment times"
,
OFFSET
(
time_delta
),
AV_OPT_TYPE_DURATION
,
{.
i64
=
0
},
0
,
0
,
E
},
{
"segment_times"
,
"set segment split time points"
,
OFFSET
(
times_str
),
AV_OPT_TYPE_STRING
,{.
str
=
NULL
},
0
,
0
,
E
},
{
"segment_times"
,
"set segment split time points"
,
OFFSET
(
times_str
),
AV_OPT_TYPE_STRING
,{.
str
=
NULL
},
0
,
0
,
E
},
{
"segment_frames"
,
"set segment split frame numbers"
,
OFFSET
(
frames_str
),
AV_OPT_TYPE_STRING
,{.
str
=
NULL
},
0
,
0
,
E
},
{
"segment_frames"
,
"set segment split frame numbers"
,
OFFSET
(
frames_str
),
AV_OPT_TYPE_STRING
,{.
str
=
NULL
},
0
,
0
,
E
},
{
"segment_wrap"
,
"set number after which the index wraps"
,
OFFSET
(
segment_idx_wrap
),
AV_OPT_TYPE_INT
,
{.
i64
=
0
},
0
,
INT_MAX
,
E
},
{
"segment_wrap"
,
"set number after which the index wraps"
,
OFFSET
(
segment_idx_wrap
),
AV_OPT_TYPE_INT
,
{.
i64
=
0
},
0
,
INT_MAX
,
E
},
...
...
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