generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '6672f672d98cf4887e13321b6f67682cfd1273b4' into release/2.2

Browse Source 
* commit '6672f672d98cf4887e13321b6f67682cfd1273b4':
  avconv: make -shortest work with streamcopy

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-06-20 00:06:36 +02:00
parent f378636d90 6672f672d9
commit 220bbc44c2
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ffmpeg.c
View File

@@ -1102,6 +1102,19 @@ static void do_video_stats(OutputStream *ost, int frame_size)
} }
} }
static void finish_output_stream(OutputStream *ost)
{
OutputFile *of = output_files[ost->file_index];
int i;
ost->finished = ENCODER_FINISHED | MUXER_FINISHED;
if (of->shortest) {
for (i = 0; i < of->ctx->nb_streams; i++)
output_streams[of->ost_index + i]->finished = ENCODER_FINISHED | MUXER_FINISHED;
}
}
/** /**
* Get and encode new output from any of the filtergraphs, without causing * Get and encode new output from any of the filtergraphs, without causing
* activity. * activity.
@@ -3158,7 +3171,7 @@ static int process_input(int file_index)
if (ost->source_index == ifile->ist_index + i && if (ost->source_index == ifile->ist_index + i &&
(ost->stream_copy || ost->enc->type == AVMEDIA_TYPE_SUBTITLE)) (ost->stream_copy || ost->enc->type == AVMEDIA_TYPE_SUBTITLE))
close_output_stream(ost); finish_output_stream(ost);
} }
} }