Commit 920cfe58 authored by michael's avatar michael

Favor streams with more packets if the user did not specify what she wants.

Fixes issue1156


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@22002 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent c1c88455
......@@ -1777,6 +1777,7 @@ static int av_encode(AVFormatContext **output_files,
}
} else {
int best_nb_frames=-1;
/* get corresponding input stream index : we select the first one with the right type */
found = 0;
for(j=0;j<nb_istreams;j++) {
......@@ -1797,9 +1798,11 @@ static int av_encode(AVFormatContext **output_files,
}
if (ist->discard && ist->st->discard != AVDISCARD_ALL && !skip &&
ist->st->codec->codec_type == ost->st->codec->codec_type) {
ost->source_index = j;
found = 1;
break;
if(best_nb_frames < ist->st->codec_info_nb_frames){
best_nb_frames= ist->st->codec_info_nb_frames;
ost->source_index = j;
found = 1;
}
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment