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
3bee286a
Commit
3bee286a
authored
Jan 13, 2012
by
Stefano Sabatini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/segment: pass the top level chained muxer format context to segment_end()
Consistent with segment_start() and less confusing.
parent
91ce7c21
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
segment.c
libavformat/segment.c
+6
-4
No files found.
libavformat/segment.c
View file @
3bee286a
...
...
@@ -89,15 +89,17 @@ fail:
return
err
;
}
static
int
segment_end
(
AVFormatContext
*
oc
)
static
int
segment_end
(
AVFormatContext
*
s
)
{
SegmentContext
*
seg
=
s
->
priv_data
;
AVFormatContext
*
oc
=
seg
->
avf
;
int
ret
=
0
;
if
(
oc
->
oformat
->
write_trailer
)
ret
=
oc
->
oformat
->
write_trailer
(
oc
);
if
(
ret
<
0
)
av_log
(
oc
,
AV_LOG_ERROR
,
"Failure occurred when ending segment '%s'
\n
"
,
av_log
(
s
,
AV_LOG_ERROR
,
"Failure occurred when ending segment '%s'
\n
"
,
oc
->
filename
);
avio_close
(
oc
->
pb
);
...
...
@@ -204,7 +206,7 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt)
av_log
(
s
,
AV_LOG_DEBUG
,
"Next segment starts at %d %"
PRId64
"
\n
"
,
pkt
->
stream_index
,
pkt
->
pts
);
ret
=
segment_end
(
oc
);
ret
=
segment_end
(
s
);
if
(
!
ret
)
ret
=
segment_start
(
s
);
...
...
@@ -242,7 +244,7 @@ static int seg_write_trailer(struct AVFormatContext *s)
{
SegmentContext
*
seg
=
s
->
priv_data
;
AVFormatContext
*
oc
=
seg
->
avf
;
int
ret
=
segment_end
(
oc
);
int
ret
=
segment_end
(
s
);
if
(
seg
->
list
)
avio_close
(
seg
->
pb
);
oc
->
streams
=
NULL
;
...
...
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