diff options
| author | Anton Khirnov <anton@khirnov.net> | 2020-10-13 13:45:05 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2020-10-28 13:57:38 +0100 |
| commit | 201b1246e23671d54287234b525f58bef900baef (patch) | |
| tree | 93a961f411ff643441cbd88e9b65b8093b332c40 /fftools | |
| parent | 48f3ed96e950209c1d31c61b07269d2d801f5aa4 (diff) | |
| download | ffmpeg-201b1246e23671d54287234b525f58bef900baef.tar.gz | |
ffmpeg.c: rename 'area' to 'score'
Other factors besides area are used to pick the best video stream, so
the name 'area' is misleading.
Diffstat (limited to 'fftools')
| -rw-r--r-- | fftools/ffmpeg_opt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 19f719e3ff..a0d1b06f2d 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -2210,22 +2210,22 @@ static int open_output_file(OptionsContext *o, const char *filename) /* video: highest resolution */ if (!o->video_disable && av_guess_codec(oc->oformat, NULL, filename, NULL, AVMEDIA_TYPE_VIDEO) != AV_CODEC_ID_NONE) { - int area = 0, idx = -1; + int best_score = 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; + int score; ist = input_streams[i]; - new_area = ist->st->codecpar->width * ist->st->codecpar->height + 100000000*!!ist->st->codec_info_nb_frames + score = ist->st->codecpar->width * ist->st->codecpar->height + 100000000*!!ist->st->codec_info_nb_frames + 5000000*!!(ist->st->disposition & AV_DISPOSITION_DEFAULT); if (ist->user_set_discard == AVDISCARD_ALL) continue; if((qcr!=MKTAG('A', 'P', 'I', 'C')) && (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC)) - new_area = 1; + score = 1; if (ist->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && - new_area > area) { + score > best_score) { if((qcr==MKTAG('A', 'P', 'I', 'C')) && !(ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC)) continue; - area = new_area; + best_score = score; idx = i; } } |