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

Fixes issue1156

Originally committed as revision 22002 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index ad45ea321809286ffd3bed701dc5cc1ee817cc85..ecaa7e114d7d6c0e0ed7da89d5c8f3928d752e40 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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;
+                            }
                         }
                     }