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
4d56f7ab
Commit
4d56f7ab
authored
May 04, 2017
by
Mark Thompson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avconv: Flush output BSFs when stream copy reaches EOF
Same as
f64d1100
, for stream copy rather than encode.
parent
66aa9b94
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
avconv.c
avtools/avconv.c
+8
-2
No files found.
avtools/avconv.c
View file @
4d56f7ab
...
@@ -1127,6 +1127,12 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
...
@@ -1127,6 +1127,12 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
int64_t
ost_tb_start_time
=
av_rescale_q
(
start_time
,
AV_TIME_BASE_Q
,
ost
->
mux_timebase
);
int64_t
ost_tb_start_time
=
av_rescale_q
(
start_time
,
AV_TIME_BASE_Q
,
ost
->
mux_timebase
);
AVPacket
opkt
;
AVPacket
opkt
;
// EOF: flush output bitstream filters.
if
(
!
pkt
)
{
output_packet
(
of
,
&
opkt
,
ost
,
1
);
return
;
}
av_init_packet
(
&
opkt
);
av_init_packet
(
&
opkt
);
if
((
!
ost
->
frame_number
&&
!
(
pkt
->
flags
&
AV_PKT_FLAG_KEY
))
&&
if
((
!
ost
->
frame_number
&&
!
(
pkt
->
flags
&
AV_PKT_FLAG_KEY
))
&&
...
@@ -1590,7 +1596,7 @@ static void process_input_packet(InputStream *ist, const AVPacket *pkt, int no_e
...
@@ -1590,7 +1596,7 @@ static void process_input_packet(InputStream *ist, const AVPacket *pkt, int no_e
break
;
break
;
}
}
}
}
for
(
i
=
0
;
pkt
&&
i
<
nb_output_streams
;
i
++
)
{
for
(
i
=
0
;
i
<
nb_output_streams
;
i
++
)
{
OutputStream
*
ost
=
output_streams
[
i
];
OutputStream
*
ost
=
output_streams
[
i
];
if
(
!
check_output_constraints
(
ist
,
ost
)
||
ost
->
encoding_needed
)
if
(
!
check_output_constraints
(
ist
,
ost
)
||
ost
->
encoding_needed
)
...
@@ -2779,7 +2785,7 @@ static int transcode(void)
...
@@ -2779,7 +2785,7 @@ static int transcode(void)
/* at the end of stream, we must flush the decoder buffers */
/* at the end of stream, we must flush the decoder buffers */
for
(
i
=
0
;
i
<
nb_input_streams
;
i
++
)
{
for
(
i
=
0
;
i
<
nb_input_streams
;
i
++
)
{
ist
=
input_streams
[
i
];
ist
=
input_streams
[
i
];
if
(
!
input_files
[
ist
->
file_index
]
->
eof_reached
&&
ist
->
decoding_needed
)
{
if
(
!
input_files
[
ist
->
file_index
]
->
eof_reached
)
{
process_input_packet
(
ist
,
NULL
,
0
);
process_input_packet
(
ist
,
NULL
,
0
);
}
}
}
}
...
...
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