[FFmpeg-cvslog] ffmpeg_opt: Favor streams that had packets

Michael Niedermayer git at videolan.org
Wed Jul 1 23:01:12 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  1 22:19:53 2015 +0200| [52c5521877aaba1a8effdb5e4924b0897060bd21] | committer: Michael Niedermayer

ffmpeg_opt: Favor streams that had packets

Fixes Thailand-Wave.wmv without explicitly specifying a stream

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52c5521877aaba1a8effdb5e4924b0897060bd21
---

 ffmpeg_opt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 5c2bd48..048c3df 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1919,7 +1919,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
             for (i = 0; i < nb_input_streams; i++) {
                 int new_area;
                 ist = input_streams[i];
-                new_area = ist->st->codec->width * ist->st->codec->height;
+                new_area = ist->st->codec->width * ist->st->codec->height + 100000000*!!ist->st->codec_info_nb_frames;
                 if((qcr!=MKTAG('A', 'P', 'I', 'C')) && (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC))
                     new_area = 1;
                 if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&



More information about the ffmpeg-cvslog mailing list