RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

12_finish_encoding_at_shortest_stream_was_finished.patch by (Calcium | calcium nurs or jp) 

Originally committed as revision 4064 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Calcium 2005-03-23 00:52:31 +00:00 committed by Michael Niedermayer
parent 6c13c880fa
commit ca80810bd9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg.c
View File

@ -242,6 +242,7 @@ static int video_stream_copy = 0;
static int video_sync_method= 1; static int video_sync_method= 1;
static int audio_sync_method= 0; static int audio_sync_method= 0;
static int copy_ts= 0; static int copy_ts= 0;
static int opt_shortest = 0; //
static int rate_emu = 0; static int rate_emu = 0;
@ -1891,7 +1892,7 @@ static int av_encode(AVFormatContext **output_files,
is = input_files[file_index]; is = input_files[file_index];
if (av_read_frame(is, &pkt) < 0) { if (av_read_frame(is, &pkt) < 0) {
file_table[file_index].eof_reached = 1; file_table[file_index].eof_reached = 1;
continue; if (opt_shortest) break; else continue; //
} }
if (!pkt.size) { if (!pkt.size) {
@ -3935,6 +3936,7 @@ const OptionDef options[] = {
{ "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" }, { "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" },
{ "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" }, { "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" },
{ "copyts", OPT_BOOL | OPT_EXPERT, {(void*)&copy_ts}, "copy timestamps" }, { "copyts", OPT_BOOL | OPT_EXPERT, {(void*)&copy_ts}, "copy timestamps" },
{ "shortest", OPT_BOOL | OPT_EXPERT, {(void*)&opt_shortest}, "finish encoding within shortest input" }, //
/* video options */ /* video options */
{ "b", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate}, "set video bitrate (in kbit/s)", "bitrate" }, { "b", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate}, "set video bitrate (in kbit/s)", "bitrate" },