[FFmpeg-cvslog] ffmpeg: factor area out of video stream selection code.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 25 23:59:34 2012 +0200| [a7b483953d1ae433dc9d498ae77342a153539a08] | committer: Michael Niedermayer

ffmpeg: factor area out of video stream selection code.

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

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

 ffmpeg_opt.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index e46880c..076852d 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1496,12 +1496,14 @@ void opt_output_file(void *optctx, const char *filename)
             int area = 0, idx = -1;
             int qcr = avformat_query_codec(oc->oformat, oc->oformat->video_codec, 0);
             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;
                 if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
-                    ist->st->codec->width * ist->st->codec->height > area) {
+                    new_area > area) {
                     if((qcr==MKTAG('A', 'P', 'I', 'C')) && !(ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC))
                         continue;
-                    area = ist->st->codec->width * ist->st->codec->height;
+                    area = new_area;
                     idx = i;
                 }
             }