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

avconv: Flush output BSFs when stream copy reaches EOF

Browse Source 
Same as f64d1100a5, for stream copy
rather than encode.
This commit is contained in:
Mark Thompson
2017-05-04 23:01:23 +01:00
parent 66aa9b94da
commit 4d56f7ab8f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
avtools/avconv.c
View File

@@ -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
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)
/* 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);
} }
} }